导入付款接口+付款列表计算金额修改

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/service/impl/HlwPaymentDetailServiceImpl.java

@@ -281,7 +281,10 @@ public class HlwPaymentDetailServiceImpl extends ServiceImpl<HlwPaymentDetailMap
                 hlwPaymentDetail.setPayment(Double.parseDouble((String) paymentList.get(i).get("payment")));
             }
             hlwPaymentDetail.setPaymentType(hlwCompany.getPaymentType());
-            hlwPaymentDetail.setStatus(1);
+            //-1状态慧盈设置为null，其他应用还是默认1
+            if(status==null){
+                hlwPaymentDetail.setStatus(1);
+            }
             hlwPaymentDetail.setIsSupplementPayment(0);
             hlwPaymentDetail.setDelFlag("0");
             hlwPaymentDetail.setCreateBy(jsonObject.getString("loginUserName"));

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

@@ -1442,31 +1442,33 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
             queryWrapperT.eq("payment_id", hlwPaymentT.getId());
             List<HlwPaymentDetail> hlwPaymentDetailList = hlwPaymentDetailService.list(queryWrapperT);
             int size = hlwPaymentDetailList.size();
-            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;
+            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;
+                }
             }
             hlwPaymentT.setRemark(remark.toString());
         }