no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/settle/repair/DailyImportSummaryLogic.java

@@ -464,8 +464,10 @@ public class DailyImportSummaryLogic {
                         //不够扣，应发金额为0
                         issueCost = BigDecimal.valueOf(0);
                         //记录下次要扣的钱
-                        SettleDailyRemaineBuckle dailyRemaineBuckle = supplyRemaineBuckle(subAmount, DictCodeEnum.EMP_RESIDUAL_DAILY.toString(), cost.getWorkerNumber(),
-                                Constant.DAILY_PREFIX + summaryBatchNo, cost.getWebsitName(), cost.getWebsitNumber(), opName, cost.getIdCard());
+                        SettleDailyRemaineBuckle dailyRemaineBuckle = supplyRemaineBuckle(subAmount, DictCodeEnum.EMP_RESIDUAL_DAILY.toString(),
+                                cost.getWorkerNumber(), Constant.DAILY_PREFIX + summaryBatchNo,
+                                cost.getWebsitName(), cost.getWebsitNumber(), opName, cost.getIdCard(),
+                                adminUser.getAdminCompanyWechat().getCompanyWechatId(), adminUser.getAdminCompanyWechat().getCompanyName());
 
                         log.info("【产生历史待扣费用11】:{}", JSONObject.toJSONString(dailyRemaineBuckle));
 
@@ -489,7 +491,8 @@ public class DailyImportSummaryLogic {
                         issueCost = BigDecimal.valueOf(0);
                         //记录下次要扣的钱
                         SettleDailyRemaineBuckle dailyRemaineBuckle = this.supplyRemaineBuckle(subAmount, DictCodeEnum.INSURANCE_DAILY.toString(), cost.getWorkerNumber(),
-                                Constant.DAILY_PREFIX + summaryBatchNo, cost.getWebsitName(), cost.getWebsitNumber(), opName, cost.getIdCard());
+                                Constant.DAILY_PREFIX + summaryBatchNo, cost.getWebsitName(), cost.getWebsitNumber(), opName, cost.getIdCard(),
+                                adminUser.getAdminCompanyWechat().getCompanyWechatId(), adminUser.getAdminCompanyWechat().getCompanyName());
 
                         log.info("【产生历史待扣费用12】:{}", JSONObject.toJSONString(dailyRemaineBuckle));
 
@@ -557,7 +560,8 @@ public class DailyImportSummaryLogic {
                     //产生历史费用
                     //记录下次要扣的钱(这里不需要生成临时的批次号，驳回的时候也依据这个临时的批次号删除)
                     SettleDailyRemaineBuckle dailyRemaineBuckle = this.supplyRemaineBuckle(sum, remaine.getCostType(), remaine.getWorkerNumber(),
-                            summaryBatchNoTmp, remaine.getWebsitName(), remaine.getWebsitNumber(), opName, remaine.getIdcard());
+                            summaryBatchNoTmp, remaine.getWebsitName(), remaine.getWebsitNumber(), opName, remaine.getIdcard(),
+                            adminUser.getAdminCompanyWechat().getCompanyWechatId(), adminUser.getAdminCompanyWechat().getCompanyName());
                     dailyRemaineBuckle.insert();
                 }
             }
@@ -589,7 +593,8 @@ public class DailyImportSummaryLogic {
                     //产生历史费用
                     //记录下次要扣的钱(这里不需要生成临时的批次号，驳回的时候也依据这个临时的批次号删除)
                     SettleDailyRemaineBuckle dailyRemaineBuckle = this.supplyRemaineBuckle(sum, remaine.getCostType(), remaine.getWorkerNumber(),
-                            summaryBatchNoTmp, remaine.getWebsitName(), remaine.getWebsitNumber(), opName, remaine.getIdcard());
+                            summaryBatchNoTmp, remaine.getWebsitName(), remaine.getWebsitNumber(), opName, remaine.getIdcard(),
+                            adminUser.getAdminCompanyWechat().getCompanyWechatId(), adminUser.getAdminCompanyWechat().getCompanyName());
                     dailyRemaineBuckle.insert();
                 }
             }
@@ -646,7 +651,8 @@ public class DailyImportSummaryLogic {
                     //产生历史费用
                     //记录下次要扣的钱(这里不需要生成临时的批次号，驳回的时候也依据这个临时的批次号删除)
                     SettleDailyRemaineBuckle dailyRemaineBuckle = this.supplyRemaineBuckle(sum, remaine.getCostType(), remaine.getWorkerNumber(),
-                            summaryBatchNoTmp, remaine.getWebsitName(), remaine.getWebsitNumber(), opName, remaine.getIdcard());
+                            summaryBatchNoTmp, remaine.getWebsitName(), remaine.getWebsitNumber(), opName, remaine.getIdcard(),
+                            adminUser.getAdminCompanyWechat().getCompanyWechatId(), adminUser.getAdminCompanyWechat().getCompanyName());
 
                     log.info("【产生历史待扣费用2】:{}", JSONObject.toJSONString(dailyRemaineBuckle));
 
@@ -664,7 +670,8 @@ public class DailyImportSummaryLogic {
     }
 
     public SettleDailyRemaineBuckle supplyRemaineBuckle(BigDecimal buckle, String type, String workerNumber,
-                                                        String summaryBatchNo, String websiteName, String websiteNumber, String opName, String idcard) {
+                                                        String summaryBatchNo, String websiteName, String websiteNumber,
+                                                        String opName, String idcard, String companyId, String companyName) {
         SettleDailyRemaineBuckle bean = new SettleDailyRemaineBuckle();
         bean.setCostType(type);
         bean.setBuckleAmount(buckle);
@@ -676,6 +683,8 @@ public class DailyImportSummaryLogic {
         bean.setWebsitName(websiteName);
         bean.setIdcard(idcard);
         bean.setWebsitNumber(websiteNumber);
+        bean.setCompanyWechatId(companyId);
+        bean.setCompanyWechatName(companyName);
         //bean.insert();
         return bean;
     }