需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -1,6 +1,7 @@
 package com.gree.mall.manager.logic.policy;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.db.sql.Order;
 import com.alibaba.druid.support.spring.stat.annotation.Stat;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -55,6 +56,7 @@ public class WorkerManagerLogic {
 
     public void stop(String id) {
 
+        AdminUserCom adminUser = commonLogic.getAdminUser();
         WebsitUser websitUserBean = websitUserService.getById(id);
         if (!websitUserBean.getExamineStatus().equals(ExamineWorkerStatusEnum.OK.getKey()))
             throw new RemoteServiceException("师傅不处于审核通过");
@@ -63,6 +65,14 @@ public class WorkerManagerLogic {
         websitUser.setId(id);
         websitUser.setExamineStatus(ExamineWorkerStatusEnum.STOP.getKey());
         websitUser.updateById();
+
+        WebsitUserLog websitUserLog = new WebsitUserLog();
+
+        websitUserLog.setTypeText("暂停接单");
+        websitUserLog.setOpRemark("操作该账号暂停接单");
+
+        websitUserLog.insert();
+
     }
 
     public void activation(String id) {
@@ -75,6 +85,13 @@ public class WorkerManagerLogic {
         websitUser.setId(id);
         websitUser.setExamineStatus(ExamineWorkerStatusEnum.POLICY_WAIT.getKey());
         websitUser.updateById();
+
+        WebsitUserLog websitUserLog = new WebsitUserLog();
+
+        websitUserLog.setTypeText("激活账号");
+        websitUserLog.setOpRemark("操作激活账号");
+
+        websitUserLog.insert();
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -103,6 +120,13 @@ public class WorkerManagerLogic {
         websitUser.setId(id);
         websitUser.setExamineStatus(ExamineWorkerStatusEnum.QUIT.getKey());
         websitUser.updateById();
+
+        WebsitUserLog websitUserLog = new WebsitUserLog();
+
+        websitUserLog.setTypeText("操作离职");
+        websitUserLog.setOpRemark("操作离职");
+
+        websitUserLog.insert();
     }
 
     public void againQuit(String id) {
@@ -115,6 +139,13 @@ public class WorkerManagerLogic {
         websitUser.setId(id);
         websitUser.setExamineStatus(ExamineWorkerStatusEnum.POLICY_WAIT.getKey());
         websitUser.updateById();
+
+        WebsitUserLog websitUserLog = new WebsitUserLog();
+
+        websitUserLog.setTypeText("重新入职");
+        websitUserLog.setOpRemark("操作重新入职");
+
+        websitUserLog.insert();
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -136,6 +167,8 @@ public class WorkerManagerLogic {
         workerManagerBean.updateById();
 
 
+        this.changeList(workerManagerBean.getWorkerPolicies(),workerManagerBean.getId());
+
         workerManagerBean.getUser().setWorkerNumber(workerManagerBean.getWorkerNumber());
 
         workerManagerBean.getUser().updateById();
@@ -157,6 +190,7 @@ public class WorkerManagerLogic {
         for (WorkerPolicy workerPolicy : workerManagerBean.getWorkerPolicies()) {
             workerPolicy.setWorkerId(workerManagerBean.getUserId());
             workerPolicy.setWebsitUserId(workerManagerBean.getId());
+            workerPolicy.setEndTime(DateUtil.endOfDay(workerPolicy.getEndTime()));
         }
 
         workerPolicyService.saveOrUpdateBatch(workerManagerBean.getWorkerPolicies());
@@ -164,6 +198,47 @@ public class WorkerManagerLogic {
 
     }
 
+    private void changeList(List<WorkerPolicy> workerPolicies, String id) {
+
+        List<WorkerPolicy> workerPolicyList = workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId, id).list();
+
+        for (WorkerPolicy workerPolicy : workerPolicies) {
+
+            workerPolicy.setEndTime(DateUtil.endOfDay(workerPolicy.getEndTime()));
+
+            if (StringUtil.isEmpty(workerPolicy.getId())){
+                WebsitUserLog websitUserLog = new WebsitUserLog();
+
+                websitUserLog.setTypeText("添加保险");
+                websitUserLog.setOpRemark("保险时间为"+ DateUtil.format(workerPolicy.getStartTime(),"yyyy-MM-dd")+","+
+                        DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd"));
+
+                websitUserLog.insert();
+            }else {
+                List<WorkerPolicy> workerPolicyLists = workerPolicyList.stream()
+                        .filter(item -> item.getId().equals(workerPolicy.getId())).collect(Collectors.toList());
+                if (CollectionUtils.isEmpty(workerPolicies))
+                    continue;
+
+                WorkerPolicy workerPolicyOne = workerPolicyLists.get(0);
+
+                if (!(workerPolicyOne.getStartTime().equals(workerPolicy.getStartTime()) && workerPolicyOne.getEndTime().equals(workerPolicy.getEndTime()))) {
+                    WebsitUserLog websitUserLog = new WebsitUserLog();
+
+                    websitUserLog.setTypeText("更改保险日期");
+                    websitUserLog.setOpRemark("保险时间为"+ DateUtil.format(workerPolicy.getStartTime(),"yyyy-MM-dd")+","+
+                            DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd"));
+
+                    websitUserLog.insert();
+
+                }
+
+
+            }
+        }
+    }
+
+
     @Transactional(rollbackFor = Exception.class)
     public WorkerManagerDetail detail(String id) {
 
@@ -234,6 +309,8 @@ public class WorkerManagerLogic {
             workerImg.setWorkerId(workerManagerBean.getUserId());
         }
 
+        this.changeList(workerManagerBean.getWorkerPolicies(),workerManagerBean.getId());
+
 
         workerImgService.saveOrUpdateBatch(workerManagerBean.getWorkerImgs());
 
@@ -547,6 +624,8 @@ public class WorkerManagerLogic {
             workerPolicy.setWebsitUserId(workerManagerBean.getId());
         }
 
+        this.changeList(workerManagerBean.getWorkerPolicies(),workerManagerBean.getId());
+
         workerPolicyService.saveOrUpdateBatch(workerManagerBean.getWorkerPolicies());
 
         if (workerManagerBean.getExamineStatus().equals(ExamineWorkerStatusEnum.FAIL.getKey()))

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

@@ -281,6 +281,10 @@ public class UserLogic {
             userWait.setUserType(userTypeEnum.getKey());
             userWait.setMobile(mobile);
 
+            if(websitUserService.lambdaQuery().eq(WebsitUser::getWebsitId,adminWebsit.getWebsitId())
+            .eq(WebsitUser::getWorkerNumber,workerNumber).count() > 0)
+                throw new RemoteServiceException(workerNumber+"该师傅已有入驻信息");
+
 
             if (adminWebsit.getInsureType().equals("意外险,工伤险")) {