11-17 收款金额非空+活动id展示

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("银行流水订单号")

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) {

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,