修改账户监测

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/api/controller/HlwAutoMonitorApiController.java

@@ -152,7 +152,8 @@ public class HlwAutoMonitorApiController extends JeecgController<HlwOrder, IHlwO
                 //-1小于；0等于；1：大于
                 if (data1.compareTo(data2) != 0) {
                     list.add(hlwCompanyAccount);
-                    break;
+                    hlwCompanyAccount.setErrorMsg("入账错误");
+                    continue;
                 }
 
                 //比较出账（付款）
@@ -165,11 +166,12 @@ public class HlwAutoMonitorApiController extends JeecgController<HlwOrder, IHlwO
                     totalServiceFee=businessAccountUtils.add(totalServiceFee,hlwCompanyAccountDetailList1.get(i).getServiceFee());
 
                 }
-                BigDecimal data3 = new BigDecimal(totalPayment);
+                BigDecimal data3 = new BigDecimal(businessAccountUtils.add(totalPayment,totalServiceFee));
                 BigDecimal data4 = new BigDecimal(hlwCompanyAccount.getTotalPayment());
                 if (data3.compareTo(data4) != 0) {
                     list.add(hlwCompanyAccount);
-                    break;
+                    hlwCompanyAccount.setErrorMsg("付款错误");
+                    continue;
                 }
 
                 //比较服务费
@@ -177,7 +179,8 @@ public class HlwAutoMonitorApiController extends JeecgController<HlwOrder, IHlwO
                 BigDecimal data6 = new BigDecimal(hlwCompanyAccount.getTotalServiceFee());
                 if (data5.compareTo(data6) != 0) {
                     list.add(hlwCompanyAccount);
-                    break;
+                    hlwCompanyAccount.setErrorMsg("服务费错误");
+                    continue;
                 }
             }
         }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwaccount/entity/HlwCompanyAccount.java

@@ -147,4 +147,9 @@ public class HlwCompanyAccount implements Serializable {
      */
     @TableField(exist = false)
     private Integer pageSize;
+
+
+    //账户监测错误类型
+    @TableField(exist = false)
+    private String errorMsg;
 }