Merge remote-tracking branch 'origin/milestone-20251016-现金管理' into milestone-20251016-现金管理

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 ? "编辑成功" : "编辑失败";

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", "韩国", "非网"
                 );
 
                 // 先放固定顺序（存在的才放）

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">