no message

mall-server-api/src/main/java/com/gree/mall/manager/controller/settle/repair/DailyImportSummaryController.java

@@ -176,7 +176,7 @@ public class DailyImportSummaryController {
     ) throws Exception {
         Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_DAILY_SUMMARY);
         if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("正在汇总中，请稍后再试");
+            throw new RemoteServiceException("正在执行中，请稍后再试");
         }
         try {
             dailyImportSummaryLogic.reduceCountDo(importBatchNo);
@@ -194,7 +194,7 @@ public class DailyImportSummaryController {
     ) throws Exception {
         Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_DAILY_SUMMARY);
         if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("正在汇总中，请稍后再试");
+            throw new RemoteServiceException("正在执行中，请稍后再试");
         }
         try {
             dailyImportSummaryLogic.reduceBatchDo(ids);

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

@@ -899,6 +899,9 @@ public class DailyImportSummaryLogic {
         }
 
         String opName = adminUser.getNickName();
+
+
+
         settleDailyIncrDecrCostService.lambdaUpdate()
                 .set(SettleDailyIncrDecrCost::getDoStatus, DailyConstant.DO_STATUS_HAS)
                 .set(SettleDailyIncrDecrCost::getDoTime, new Date())

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -426,6 +426,7 @@ public class UserLogic {
                 .set(User::getType, type.getKey())
                 .set(StringUtils.isNotBlank(idCard), User::getIdCard, idCard)
                 .set(StringUtils.isNotBlank(idCardImg), User::getIdCardImg, idCardImg)
+                .set(!StringUtils.equals(type.getKey(), UserTypeEnum.WORKER.getKey()), User::getWorkerNumber, null)
                 .in(User::getUserId, userId)
                 .update();