From 56833f274a3626f6fa271fdbdf95ce4fc35b0e66 Mon Sep 17 00:00:00 2001
From: wangguorui <2069821375@qq.com>
Date: Tue, 14 Apr 2026 11:35:50 +0800
Subject: [PATCH] =?UTF-8?q?20260414=20=E4=B8=9A=E7=BB=A9=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/demo/serviceImpl/cash/CashCollectionServiceImpl.java    | 6 ++++--
 src/main/resources/cashMapper/CashCollectionMapper.xml              | 2 +-
 src/main/resources/cashMapper/CashRefundMapper.xml                  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

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 f5b9599..481417d 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
@@ -792,10 +792,12 @@ public class CashCollectionServiceImpl implements CashCollectionService {
                 String remark;
                 if (adjustedValue > 0) {
                     // Positive value: row to column (转出方 to 转入方)
-                    remark = fromName + "→" + toName + "调整金额：" + adjustedValue;
+                    double amountInYuan = adjustedValue / 100.0;
+                    remark = fromName + "→" + toName + "调整金额：" + amountInYuan;
                 } else {
                     // Negative value: column to row (转入方 to 转出方)
-                    remark = toName + "→" + fromName + "调整金额：" + -adjustedValue;
+                    double amountInYuan = (-adjustedValue) / 100.0;
+                    remark = toName + "→" + fromName + "调整金额：" + amountInYuan;
                 }
 
                 // Create CashRecord objects and call mapper adjust method twice
diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml
index 4f73a6c..e28e683 100644
--- a/src/main/resources/cashMapper/CashCollectionMapper.xml
+++ b/src/main/resources/cashMapper/CashCollectionMapper.xml
@@ -329,7 +329,7 @@
 
     <select id="performanceSelect" resultType="com.example.demo.domain.vo.cash.PerformanceVO" parameterType="com.example.demo.domain.DTO.PerformanceDTO">
         <!-- 原始收款记录 -->
-        select cr.pay_time,cr.order_code,m2.name as receivedMarketName,m1.name as performanceMarketName,cr.name,cr.jwcode,cr.goods_name,cr.remark,cr.good_num,cr.pay_type,r2.rate_name as receivedCurrency,cr.payment_amount/100 as payment_amount,cr.handling_charge/100 as handling_charge,cr.received_amount/100 as received_amount
+        select cr.pay_time,cr.order_code,m2.name as receivedMarketName,m1.name as performanceMarketName,cr.name,cr.jwcode,cr.goods_name,cr.remark,cr.good_num,cr.pay_type,r2.rate_name as receivedCurrency,cr.payment_amount/100 as payment_amount,IFNULL(cr.handling_charge/100, 0) as handling_charge,cr.received_amount/100 as received_amount
         from cash_record_collection cr
         left join market m1 on m1.id = cr.performance_market
         left join market m2 on m2.id = cr.received_market
diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml
index 1568571..b4ec7a4 100644
--- a/src/main/resources/cashMapper/CashRefundMapper.xml
+++ b/src/main/resources/cashMapper/CashRefundMapper.xml
@@ -465,7 +465,7 @@
         ROUND(crc.payment_amount / 100.0, 2) as paymentAmount,
         crc.received_currency,
         ROUND(crc.received_amount / 100.0, 2) as receivedAmount,
-        ROUND(crc.handling_charge / 100.0, 2) as handlingCharge,
+        ROUND(IFNULL(crc.handling_charge, 0) / 100.0, 2) as handlingCharge,
         ROUND(crc.permanent_gold / 100.0, 2) as permanentGold,
         ROUND(crc.free_gold / 100.0, 2) as freeGold,
         crc.pay_type,