Merge remote-tracking branch 'origin/develop' into develop

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

@@ -831,7 +831,8 @@ public class DailyImportSummaryLogic {
                     issueRecord.setIssueCost(issueCost);
                     BigDecimal extra = BigDecimal.valueOf(0).subtract(issueCost);
                     saveRemaineBuckle(extra, DictCodeEnum.INCR_DECR_DAILY.toString(), bean.getServiceNumber(),
-                            Constant.DAILY_PREFIX + issueRecord.getSummaryNumber(), bean.getWebsitName(), bean.getWebsitNumber(), opName);
+                            Constant.DAILY_PREFIX + issueRecord.getSummaryNumber(), bean.getWebsitName(),
+                            bean.getWebsitNumber(), issueRecord.getIdCard(), opName);
                 }
                 records.add(issueRecord);
                 serviceNumberList.add(bean.getServiceNumber());
@@ -859,8 +860,8 @@ public class DailyImportSummaryLogic {
                 .update();
     }
 
-    public void saveRemaineBuckle(BigDecimal buckle, String type, String workerNumber,
-                                  String summaryBatchNo, String websiteName, String websiteNumber, String opName) {
+    public void saveRemaineBuckle(BigDecimal buckle, String type, String workerNumber, String summaryBatchNo,
+                                  String websiteName, String websiteNumber, String idCard, String opName) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         if (adminUser.getType() == 2) {
@@ -877,6 +878,7 @@ public class DailyImportSummaryLogic {
         bean.setCreateTime(new Date());
         bean.setWebsitName(websiteName);
         bean.setWebsitNumber(websiteNumber);
+        bean.setIdcard(idCard);
         bean.setCompanyWechatId(adminUser.getAdminCompanyWechat().getCompanyWechatId());
         bean.setCompanyWechatName(adminUser.getAdminCompanyWechat().getCompanyName());
         bean.insert();
@@ -1138,7 +1140,8 @@ public class DailyImportSummaryLogic {
                 if (subAmount.doubleValue() < 0) {
                     //不够扣的处理
                     saveRemaineBuckle(subAmount, DictCodeEnum.REDUCE_DAILY.toString(), bean.getWorkerNumber(),
-                            bean.getSummaryNumber(), bean.getWebsitName(), bean.getWebsitNumber(), opName);
+                            bean.getSummaryNumber(), bean.getWebsitName(), bean.getWebsitNumber(),
+                            issueRecord.getIdCard(), opName);
                     //设置为0
                     issueRecord.setReduceCost(issueRecord.getIssueCost());
                     issueRecord.setIssueCost(BigDecimal.valueOf(0));