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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -1315,10 +1315,10 @@ public class UserLogic {
         user.updateById();
 
         if (CollectionUtils.isNotEmpty(workerImgs)) {
-            workerImgService.lambdaUpdate().eq(WorkerImg::getWebsitId,currentCompanyWechat.getUserId()).remove();
+            workerImgService.lambdaUpdate().eq(WorkerImg::getUserId,currentCompanyWechat.getUserId()).remove();
             for (WorkerImg workerImg : workerImgs) {
                 workerImg.setWebsitId(websitId);
-                workerImg.setWorkerId(currentCompanyWechat.getUserId());
+                workerImg.setUserId(currentCompanyWechat.getUserId());
             }
             workerImgService.saveBatch(workerImgs);
         }

mall-server-api/src/main/java/com/gree/mall/manager/bean/policy/WorkerUserCount.java

@@ -0,0 +1,31 @@
+package com.gree.mall.manager.bean.policy;
+
+
+import com.gree.mall.manager.plus.entity.User;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class WorkerUserCount {
+
+    @ApiModelProperty(value = "入驻审批")
+    private Long rzsp;
+    @ApiModelProperty(value = "待师傅购买")
+    private Long dsfgm;
+    @ApiModelProperty(value = "保险待审批")
+    private Long bxsp;
+    @ApiModelProperty(value = "状态正常")
+    private Long ztzc;
+    @ApiModelProperty(value = "已驳回")
+    private Long ybh;
+    @ApiModelProperty(value = "证件快过期")
+    private Long zjkgq;
+    @ApiModelProperty(value = "证件已过期")
+    private Long zjygq;
+    @ApiModelProperty(value = "已暂停")
+    private Long yzt;
+    @ApiModelProperty(value = "已离职")
+    private Long ylz;
+}

mall-server-api/src/main/java/com/gree/mall/manager/bean/user/UserDetail.java

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.bean.user;
+
+import com.gree.mall.manager.plus.entity.User;
+import com.gree.mall.manager.plus.entity.WorkerImg;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.elasticsearch.client.license.LicensesStatus;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class UserDetail extends User {
+
+    @ApiModelProperty(value = "图片")
+    private List<WorkerImg> workerImgs;
+
+
+
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/controller/member/MemberController.java

@@ -10,6 +10,7 @@ import com.gree.mall.manager.bean.listvo.UserVO;
 import com.gree.mall.manager.bean.listvo.workorder.UserWaitVO;
 import com.gree.mall.manager.bean.member.UserApplyBean;
 import com.gree.mall.manager.bean.user.UserApplyWorkerBean;
+import com.gree.mall.manager.bean.user.UserDetail;
 import com.gree.mall.manager.bean.user.UserWxBean;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
@@ -364,6 +365,17 @@ public class MemberController {
         return ResponseHelper.success(detail);
     }
 
+
+    @PostMapping("/getUserDetail")
+    @ApiOperation(value = "用户详情")
+    public ResponseHelper<UserDetail> getUserDetail(
+            @ApiParam(value = "会员id", required = true) @RequestParam String userId
+    ) {
+        UserDetail detail = userLogic.getUserDetail(userId);
+        return ResponseHelper.success(detail);
+    }
+
+
     @PostMapping("/updateNickName")
     @ApiOperation(value = "修改会员昵称")
     public ResponseHelper<Void> updateNickName(

mall-server-api/src/main/java/com/gree/mall/manager/controller/member/WorkerManagerController.java

@@ -12,6 +12,7 @@ import com.gree.mall.manager.bean.member.UserApplyBean;
 import com.gree.mall.manager.bean.policy.PolicyDetail;
 import com.gree.mall.manager.bean.policy.WorkerManagerBean;
 import com.gree.mall.manager.bean.policy.WorkerManagerDetail;
+import com.gree.mall.manager.bean.policy.WorkerUserCount;
 import com.gree.mall.manager.bean.user.UserApplyWorkerBean;
 import com.gree.mall.manager.bean.user.UserWxBean;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
@@ -79,6 +80,29 @@ public class WorkerManagerController {
     }
 
 
+    @PostMapping("/list/log")
+    @ApiOperation(value = "操作日志-v2")
+    public ResponseHelper<List<WebsitUserLog>> listLog(
+            @ApiParam(value = "id", required = true) @RequestParam String id
+    ) throws RemoteServiceException {
+        List<WebsitUserLog> page = userLogic.listLog(id);
+        return ResponseHelper.success(page);
+    }
+
+
+
+
+
+    @PostMapping("/count")
+    @ApiOperation("师傅管理数量")
+    public ResponseHelper<WorkerUserCount> count(
+            HttpServletRequest request
+    ) throws ParseException {
+        WorkerUserCount workerUserCount = workerManagerLogic.countWorker();
+        return ResponseHelper.success(workerUserCount);
+    }
+
+
     @PostMapping("/stop")
     @ApiOperation("暂停接单")
     public ResponseHelper stop(

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.policy.WorkerManagerBean;
 import com.gree.mall.manager.bean.policy.WorkerManagerDetail;
+import com.gree.mall.manager.bean.policy.WorkerUserCount;
 import com.gree.mall.manager.enums.*;
 import com.gree.mall.manager.enums.workorder.OrderBaseStatusEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
@@ -127,9 +128,16 @@ public class WorkerManagerLogic {
                 throw new RemoteServiceException("师傅编号已经录入不允许更改");
             }
         }
+
+        if(userService.lambdaQuery().eq(User::getWorkerNumber,workerManagerBean.getWorkerNumber())
+                .ne(User::getUserId,workerManagerBean.getUserId()).count() > 0)
+            throw new RemoteServiceException("已有该师傅编号");
+
         workerManagerBean.updateById();
 
 
+        workerManagerBean.getUser().setWorkerNumber(workerManagerBean.getWorkerNumber());
+
         workerManagerBean.getUser().updateById();
 
         workerImgService.lambdaUpdate().eq(WorkerImg::getWorkerId,workerManagerBean.getUserId())
@@ -167,7 +175,7 @@ public class WorkerManagerLogic {
 
         workerManagerDetail.setUser(userService.getById(workerManagerDetail.getUserId()));
 
-        List<WorkerImg> list = workerImgService.lambdaQuery().eq(WorkerImg::getWorkerId, websitUser.getUserId()).list();
+        List<WorkerImg> list = workerImgService.lambdaQuery().eq(WorkerImg::getUserId, websitUser.getUserId()).list();
 
         List<WorkerPolicy> workerPolicies = workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId, websitUser.getId()).list();
 
@@ -206,6 +214,14 @@ public class WorkerManagerLogic {
         if (StringUtil.isEmpty(workerManagerBean.getWorkerNumber()))
             throw new RemoteServiceException("师傅编号不能为空");
 
+
+        if(userService.lambdaQuery().eq(User::getWorkerNumber,workerManagerBean.getWorkerNumber())
+                .ne(User::getUserId,workerManagerBean.getUserId()).count() > 0)
+            throw new RemoteServiceException("已有该师傅编号");
+
+
+        workerManagerBean.getUser().setWorkerNumber(workerManagerBean.getWorkerNumber());
+
         workerManagerBean.updateById();
 
         workerManagerBean.getUser().updateById();
@@ -302,6 +318,13 @@ public class WorkerManagerLogic {
                 }
             }
             workerManagerBean.setExamineStatus(ExamineWorkerStatusEnum.OK.getKey());
+            workerManagerBean.getUser().setType("WORKER");
+
+            websitUserService.lambdaUpdate()
+                    .eq(WebsitUser::getUserId,workerManagerBean.getUserId())
+                    .set(WebsitUser::getWorkerNumber,workerManagerBean.getWorkerNumber())
+                    .update();
+
         }else {
 
             List<WorkerPolicy> workerPolicies = workerManagerBean.getWorkerPolicies().stream().filter(item -> item.getPolicyType().equals("AC")).collect(Collectors.toList());
@@ -331,6 +354,12 @@ public class WorkerManagerLogic {
 
                 if (workerManagerBean.getWorkerPolicies().stream().filter(item -> item.getStatus().equals("BZZ")).count() > 1) {
                     workerManagerBean.setExamineStatus(ExamineWorkerStatusEnum.OK.getKey());
+                    workerManagerBean.getUser().setType("WORKER");
+
+                    websitUserService.lambdaUpdate()
+                            .eq(WebsitUser::getUserId,workerManagerBean.getUserId())
+                            .set(WebsitUser::getWorkerNumber,workerManagerBean.getWorkerNumber())
+                            .update();
                 }
 
 
@@ -351,6 +380,12 @@ public class WorkerManagerLogic {
 
                 if (workerManagerBean.getWorkerPolicies().stream().filter(item -> item.getStatus().equals("BZZ")).count() > 1) {
                     workerManagerBean.setExamineStatus(ExamineWorkerStatusEnum.OK.getKey());
+                    workerManagerBean.getUser().setType("WORKER");
+
+                    websitUserService.lambdaUpdate()
+                            .eq(WebsitUser::getUserId,workerManagerBean.getUserId())
+                            .set(WebsitUser::getWorkerNumber,workerManagerBean.getWorkerNumber())
+                            .update();
                 }
 
             }
@@ -359,6 +394,7 @@ public class WorkerManagerLogic {
         }
 
         workerManagerBean.updateById();
+        workerManagerBean.getUser().updateById();
 
         workerPolicyService.saveOrUpdateBatch(workerManagerBean.getWorkerPolicies());
 
@@ -479,6 +515,7 @@ public class WorkerManagerLogic {
         workerManagerBean.setPolicyExamineBy(adminUser.getNickName());
         workerManagerBean.setPolicyExamineTime(new Date());
 
+
         WebsitUser websitUser = websitUserService.getById(workerManagerBean.getId());
 
         if (!websitUser.getExamineStatus().equals(ExamineWorkerStatusEnum.POLICY_WAIT.getKey()))
@@ -488,6 +525,7 @@ public class WorkerManagerLogic {
         workerManagerBean.updateById();
 
 
+        workerManagerBean.getUser().setType("WORKER");
         workerManagerBean.getUser().updateById();
 
         workerImgService.lambdaUpdate().eq(WorkerImg::getWorkerId,workerManagerBean.getUserId())
@@ -600,4 +638,27 @@ public class WorkerManagerLogic {
         workerPolicyService.saveOrUpdateBatch(workerManagerBean.getWorkerPolicies());
 
 }
+
+    public WorkerUserCount countWorker( ) {
+
+
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        List<WebsitUser> websitUsers = websitUserService.lambdaQuery().in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds())
+                , WebsitUser::getWebsitId, adminUser.getAdminWebsitIds())
+                .list();
+
+        WorkerUserCount workerUserCount = new WorkerUserCount();
+        workerUserCount.setRzsp(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.WAIT.getKey())).count());
+        workerUserCount.setDsfgm(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.WAIT_WORKER.getKey())).count());
+        workerUserCount.setBxsp(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.POLICY_WAIT.getKey())).count());
+        workerUserCount.setZtzc(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.OK.getKey())).count());
+        workerUserCount.setYbh(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.FAIL.getKey())).count());
+        workerUserCount.setZjkgq(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.EXPIRED.getKey())).count());
+        workerUserCount.setZjygq(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.OVERDUE.getKey())).count());
+        workerUserCount.setYzt(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.STOP.getKey())).count());
+        workerUserCount.setYlz(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.QUIT.getKey())).count());
+        return workerUserCount;
+
+
+    }
 }

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

@@ -14,10 +14,7 @@ import com.gree.mall.manager.bean.listvo.UserVO;
 import com.gree.mall.manager.bean.listvo.workorder.UserWaitVO;
 import com.gree.mall.manager.bean.member.MemberSortBean;
 import com.gree.mall.manager.bean.member.UserApplyBean;
-import com.gree.mall.manager.bean.user.UserApplyWorkerBean;
-import com.gree.mall.manager.bean.user.UserDetailBean;
-import com.gree.mall.manager.bean.user.UserWxBean;
-import com.gree.mall.manager.bean.user.UserWxCustomerBean;
+import com.gree.mall.manager.bean.user.*;
 import com.gree.mall.manager.commonmapper.*;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.enums.PolicyOrderStutasEnum;
@@ -90,6 +87,7 @@ public class UserLogic {
     private final PgOrderBaseService pgOrderBaseService;
     private final PgOrderWorkerService pgOrderWorkerService;
     private final SettleDailyBankAccountService settleDailyBankAccountService;
+    private final WebsitUserLogService websitUserLogService;
 
 
     /**
@@ -1107,4 +1105,20 @@ public class UserLogic {
                 .eq(UserWait::getWorkerNumber,userWait.getWorkerNumber())
                 .set(UserWait::getMobile,userWait.getMobile()).update();
     }
+
+    public UserDetail getUserDetail(String userId) {
+        User user = userService.getById(userId);
+
+        UserDetail userDetail = BeanUtil.toBean(user, UserDetail.class);
+
+        List<WorkerImg> workerImgs = workerImgService.lambdaQuery().eq(WorkerImg::getUserId, userId).list();
+
+        userDetail.setWorkerImgs(workerImgs);
+        return userDetail;
+    }
+
+    public List<WebsitUserLog> listLog(String id) {
+
+        return websitUserLogService.lambdaQuery().eq(WebsitUserLog::getWebsitUserId,id).list();
+    }
 }

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1331,7 +1331,7 @@
                 </foreach>
                 AND
             </if>
-            is_notice=1 and is_pwd = 0
+            a.is_notice=1 and a.is_pwd = 0
             and not exists (select 1 from com_detail_log where user_name=#{userName} and com_list_id=a.id)
     </select>
     <select id="list" resultType="com.gree.mall.manager.bean.common.CallRecordVo">