From 94eea9059d259a7786fd207af94edf95e6cd0e91 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Thu, 23 Oct 2025 14:42:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?10-23=20=E6=94=B6=E6=AC=BE=EF=BC=9A?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=89=8B=E7=BB=AD=E8=B4=B9=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=89=8B=E7=BB=AD=E8=B4=B9=E5=8F=AF=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java  | 1 +
 src/main/resources/cashMapper/CashCollectionMapper.xml                | 4 ++--
 2 files changed, 3 insertions(+), 2 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 5a6a761..0bfd909 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
@@ -226,6 +226,7 @@ public class CashCollectionServiceImpl implements CashCollectionService {
     @Override
     public String complete(CashRecord cashRecord) {
 
+
         int rows = cashCollectionMapper.complete(cashRecord);
 
         return rows > 0 ? "编辑成功" : "编辑失败";
diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml
index d4d2eae..93f8f22 100644
--- a/src/main/resources/cashMapper/CashCollectionMapper.xml
+++ b/src/main/resources/cashMapper/CashCollectionMapper.xml
@@ -59,13 +59,13 @@
     <update id="complete">
         UPDATE cash_record
         <set>
-            <if test="cashRecord.handlingCharge != null and cashRecord.handlingCharge!=''">
+            <if test="cashRecord.handlingCharge != null ">
                 handling_charge = #{cashRecord.handlingCharge},
             </if>
             <if test="cashRecord.receivedCurrency != null and cashRecord.receivedCurrency != ''">
                 received_currency = #{cashRecord.receivedCurrency},
             </if>
-            <if test="cashRecord.receivedAmount != null">
+            <if test="cashRecord.receivedAmount != null and cashRecord.receivedAmount != ''">
                 received_amount = #{cashRecord.receivedAmount},
             </if>
             <if test="cashRecord.receivedTime != null">

From b53171d3edcdc02fc6b689245329979b0c0b43f3 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Thu, 23 Oct 2025 15:25:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?10-23=20=E5=9B=BE=E8=A1=A8=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BA=E5=B1=95=E7=A4=BA=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java
index af3e7da..c59e6d3 100644
--- a/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java
@@ -136,7 +136,7 @@ public class GeneralServiceImpl implements GeneralService {
                 allMarkets.remove("总部");
                 // 固定顺序
                 List<String> fixed = Arrays.asList(
-                        "新加坡", "马来西亚", "香港", "加拿大", "泰国", "越南HCM", "韩国", "未知"
+                        "新加坡", "马来西亚", "香港", "加拿大", "泰国", "越南HCM", "韩国", "非网"
                 );
 
                 // 先放固定顺序（存在的才放）