From eff03cf1dac4fd9343ae432cbb08ddde5fee5edb Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Sat, 4 Apr 2026 17:40:03 +0800 Subject: [PATCH] =?UTF-8?q?20260404=E4=B8=9A=E7=BB=A9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/domain/DTO/PerformanceAdjustmentDTO.java | 3 ++- .../com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/domain/DTO/PerformanceAdjustmentDTO.java b/src/main/java/com/example/demo/domain/DTO/PerformanceAdjustmentDTO.java index 0566a24..979cf2f 100644 --- a/src/main/java/com/example/demo/domain/DTO/PerformanceAdjustmentDTO.java +++ b/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; // 时间 } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index 170c15e..f1fa6fd 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/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));