From 76044f2535cb7aabae7f19047a310ca1363721a6 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Mon, 17 Nov 2025 13:50:18 +0800
Subject: [PATCH] =?UTF-8?q?11-17=20=E6=94=B6=E6=AC=BE=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E9=9D=9E=E7=A9=BA+=E6=B4=BB=E5=8A=A8id=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/vo/cash/CashCollection.java     | 2 ++
 .../com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java  | 4 ++--
 src/main/resources/cashMapper/CashCollectionMapper.xml                | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java
index d3169d5..0590983 100644
--- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java
+++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java
@@ -39,6 +39,8 @@ public class CashCollection implements Serializable {
     private String marketName;          // 所属地区名称
     @ExcelProperty("活动名称")
     private String activity;            // 活动
+    @ExcelIgnore
+    private String activityId;            // 活动
     @ExcelProperty("金币订单号")
     private String orderCode;           // 金币订单号
     @ExcelProperty("银行流水订单号")
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 fbea6bb..247bc1f 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
@@ -86,7 +86,7 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         if (cashCollection.getPaymentCurrency() == null) {
             throw new IllegalArgumentException("支付币种不能为空");
         }
-        if (cashCollection.getPaymentAmount() == null) {
+        if (cashCollection.getPaymentAmount() == null || cashCollection.getPaymentAmount().compareTo(BigDecimal.ZERO) == 0) {
             throw new IllegalArgumentException("支付金额不能为空");
         }
         if (cashCollection.getPayType() == null) {
@@ -192,7 +192,7 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         if (cashRecord.getPaymentCurrency() == null) {
             throw new IllegalArgumentException("支付币种不能为空");
         }
-        if (cashRecord.getPaymentAmount() == null) {
+        if (cashRecord.getPaymentAmount() == null || cashRecord.getPaymentAmount().compareTo(BigDecimal.ZERO) == 0) {
             throw new IllegalArgumentException("支付金额不能为空");
         }
         if (cashRecord.getPayType() == null) {
diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml
index de85114..4adae1f 100644
--- a/src/main/resources/cashMapper/CashCollectionMapper.xml
+++ b/src/main/resources/cashMapper/CashCollectionMapper.xml
@@ -116,7 +116,7 @@
     <!--多条件查询收款订单列表-->
     <select id="selectCollection1" resultType="com.example.demo.domain.vo.cash.CashCollection">
         select cr.order_type, cr.id,cr.jwcode,cr.name,cr.market,
-               m1.name as marketName,
+               m1.name as marketName, ra.id as activityId,
                ra.activity_name as activity,cr.order_code,cr.bank_code,
                cr.goods_name,cr.good_num,
                cr.num_unit,