no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/UserVO.java

@@ -15,7 +15,7 @@ import java.util.Date;
 @Data
 public class UserVO {
 
-    @ZfireField(hide = true,tbName = "b")
+    @ZfireField(hide = true, tbName = "b")
     private String id;
 
     @ZfireField(hide = true)
@@ -27,13 +27,14 @@ public class UserVO {
     @ApiModelProperty("商户名称")
     private String companyName;
 
-    @ZfireField(hide = true,tbName = "b",ignoreSelect = true)
+    @ZfireField(hide = true, tbName = "b", ignoreSelect = true)
     private String websitId;
 
-    @ZfireField(tbName = "c",colName = "name",ignoreSelect = true)
+    @ZfireField(tbName = "c", colName = "name", ignoreSelect = true)
     @ApiModelProperty("网点名称")
     private String websitName;
 
+    @ZfireField(tbName = "b")
     @ApiModelProperty("师傅编号")
     private String workerNumber;
 
@@ -49,10 +50,10 @@ public class UserVO {
     @ApiModelProperty("身份证图片")
     private String idCardImg;
 
-    @ZfireField(hide = true,tbName = "b")
+    @ZfireField(hide = true, tbName = "b")
     private String slaveWorkerId;
 
-    @ZfireField(tbName = "d",colName = "nick_name",ignoreSelect = true)
+    @ZfireField(tbName = "d", colName = "nick_name", ignoreSelect = true)
     @ApiModelProperty("辅助师傅")
     private String slaveWorkerName;
 

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

@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
@@ -96,6 +97,9 @@ public class RepairSettleAccountLogic {
 
         final List<String> websits = websitUserList.stream().map(WebsitUser::getWebsitId).distinct().collect(Collectors.toList());
 
+        final Map<String, WebsitUser> websitUserMap = websitUserList.stream()
+                .collect(Collectors.toMap(WebsitUser::getWebsitId, Function.identity(), (key1, key2) -> key2));
+
         final List<AdminWebsit> adminWebsits = adminWebsitService.lambdaQuery()
                 .eq(AdminWebsit::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId())
                 .in(AdminWebsit::getWebsitId, websits)
@@ -106,14 +110,18 @@ public class RepairSettleAccountLogic {
 
         for (String websit : websits) {
             final String websitName = websitMap.get(websit);
+            final WebsitUser websitUser = websitUserMap.get(websit);
             SettleDailyBankAccount account = new SettleDailyBankAccount();
             BeanUtils.copyProperties(dailyBankAccount, account);
             account.setCompanyWechatId(adminUser.getAdminCompanyWechat().getCompanyWechatId())
                     .setCompanyName(adminUser.getAdminCompanyWechat().getCompanyName())
                     .setWebsitId(websit)
-                    .setWebsitName(websitName);
+                    .setWebsitName(websitName)
+                    .setWorkerNumber(websitUser.getWorkerNumber());
             accountList.add(account);
         }
+
+        settleDailyBankAccountService.saveBatch(accountList);
     }
 
     public void update(SettleDailyBankAccount dailyBankAccount) {