20260404业绩调整

src/main/java/com/example/demo/domain/DTO/PerformanceAdjustmentDTO.java

@@ -3,6 +3,7 @@ package com.example.demo.domain.DTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -23,6 +24,6 @@ public class PerformanceAdjustmentDTO {
     private int[][] matrix = new int[6][6];
     private Double weight; // 权重
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
-    private Date Time; // 时间
+    private LocalDateTime Time; // 时间
 
 }

src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java

@@ -771,7 +771,9 @@ public class CashCollectionServiceImpl implements CashCollectionService {
                 // Calculate adjusted value and round to nearest integer
                 int adjustedValue = (int) (matrix[i][j] * weight);
                 matrix[i][j] = adjustedValue;
-
+                if (i == j) {
+                    continue;
+                }
                 // Skip if value is 0
                 if (adjustedValue == 0) {
                     continue;
@@ -802,6 +804,7 @@ public class CashCollectionServiceImpl implements CashCollectionService {
                     cashRecord.setSubmitterId(adjustDTO.getSubmitterId());
                     cashRecord.setSubmitterMarket(adjustDTO.getSubmitterMarket());
                     cashRecord.setRemark(remark);
+                    cashRecord.setPayTime(adjustDTO.getTime());
                     if(k == 0){
                         cashRecord.setPerformanceMarket(fromMarket);
                         cashRecord.setReceivedAmount(new BigDecimal(-adjustedValue));