Просмотр исходного кода

付款管理—列表查询报错,针对数据库该字段为null未发起的情况,状态设置为-1

ZhangWenQiang 3 лет назад
Родитель
Сommit
5c79db46c3

+ 29 - 27
happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/service/impl/HlwPaymentServiceImpl.java

@@ -1446,33 +1446,35 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
             queryWrapperT.eq("payment_id", hlwPaymentT.getId());
             List<HlwPaymentDetail> hlwPaymentDetailList = hlwPaymentDetailService.list(queryWrapperT);
             int size = hlwPaymentDetailList.size();
-            if (hlwPaymentT.getStatus() != null) {
-                switch (hlwPaymentT.getStatus()) {
-                    case HlwConstant.PAYMENT_STATUS_PAY_BACK:
-                        remark.append("合计").append(size).append("笔");
-                        break;
-                    case HlwConstant.PAYMENT_STATUS_PAY_WAIT:
-                        remark.append("合计").append(size).append("笔");
-                        break;
-                    case HlwConstant.PAYMENT_STATUS_PAY_ING:
-                        remark.append("合计").append(size).append("笔");
-                        break;
-                    case HlwConstant.PAYMENT_STATUS_PAY_OK:
-                        //成功的笔数
-                        List<HlwPaymentDetail> hlwPaymentDetailListS = hlwPaymentDetailList.stream().filter(j -> j.getStatus().equals(3)).collect(Collectors.toList());
-                        int size_success = hlwPaymentDetailListS.size();
-                        //失败的笔数
-                        int size_fail = size - size_success;
-                        remark.append("合计").append(size).append("笔").append(",成功").append(size_success).append("笔")
-                                .append(",失败").append(size_fail).append("笔");
-                        if (size_fail > 0) {
-                            hlwPaymentT.setIsAllSuccess(0);
-                        }
-                        break;
-                    default:
-                        remark.append("合计").append(size).append("笔");
-                        break;
-                }
+            // 针对数据库该字段为null,未发起的情况
+            if (hlwPaymentT.getStatus() == null) {
+                hlwPaymentT.setStatus(-1);
+            }
+            switch (hlwPaymentT.getStatus()) {
+                case HlwConstant.PAYMENT_STATUS_PAY_BACK:
+                    remark.append("合计").append(size).append("笔");
+                    break;
+                case HlwConstant.PAYMENT_STATUS_PAY_WAIT:
+                    remark.append("合计").append(size).append("笔");
+                    break;
+                case HlwConstant.PAYMENT_STATUS_PAY_ING:
+                    remark.append("合计").append(size).append("笔");
+                    break;
+                case HlwConstant.PAYMENT_STATUS_PAY_OK:
+                    //成功的笔数
+                    List<HlwPaymentDetail> hlwPaymentDetailListS = hlwPaymentDetailList.stream().filter(j -> j.getStatus().equals(3)).collect(Collectors.toList());
+                    int size_success = hlwPaymentDetailListS.size();
+                    //失败的笔数
+                    int size_fail = size - size_success;
+                    remark.append("合计").append(size).append("笔").append(",成功").append(size_success).append("笔")
+                            .append(",失败").append(size_fail).append("笔");
+                    if (size_fail > 0) {
+                        hlwPaymentT.setIsAllSuccess(0);
+                    }
+                    break;
+                default:
+                    remark.append("合计").append(size).append("笔");
+                    break;
             }
             hlwPaymentT.setRemark(remark.toString());
         }