需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/UserController.java

@@ -289,7 +289,8 @@ public class UserController {
             @ApiParam(value = "滑动验证数值",required = false) @RequestParam(required = false) String vrifyCode
     ) throws Exception {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
-        Integer count = userService.lambdaQuery().eq(User::getMobile, phone).eq(User::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId()).count();
+        Integer count = userService.lambdaQuery().eq(User::getMobile, phone).eq(User::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId())
+                .ne(User::getUserId,currentCompanyWechat.getUserId()).count();
         if(count > 0){
             throw new RemoteServiceException("手机号已被绑定，请勿重复绑定");
         }
@@ -316,6 +317,22 @@ public class UserController {
         return ResponseHelper.success();
     }
 
+    @PostMapping("phone/upBind")
+    @ApiOperation("修改绑定手机号")
+    public ResponseHelper upBind(
+            @ApiParam(value = "手机号码",required = true) @RequestParam String phone,
+            @ApiParam(value = "短信验证码",required = true) @RequestParam String code
+    ){
+
+        smsLogic.checkSmsCode(phone, code);
+
+
+        //User user = userService.lambdaQuery().eq(User::getMobile, phone).last("limit 1").one();
+        //授权手机号后检查是否有预设置的师傅身份信息
+        userLogic.upBind(phone);
+        return ResponseHelper.success();
+    }
+
     @PostMapping("open/bindOpenId")
     @ApiOperation("绑定手机号")
     public ResponseHelper bindOpenId(

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

@@ -1523,4 +1523,19 @@ public class UserLogic {
         String token = CommonUtils.getToken(request);
         redisUtil.del(Constant.RedisPrefix.TOKEN_WX + token, Constant.RedisPrefix.TOKEN_APP_USER + token);
     }
+
+    public void upBind(String phone) {
+
+        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
+
+        User user = userService.getById(currentCompanyWechat.getUserId());
+
+        userWaitService.lambdaUpdate()
+                .eq(UserWait::getMobile,user.getMobile())
+                .set(UserWait::getMobile,phone).update();
+
+
+        user.setMobile(phone).updateById();
+
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/letter/LeLetterVO.java

@@ -54,10 +54,11 @@ public class LeLetterVO  {
     @ApiModelProperty(value = "工单编号")
     private String orderId;
 
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "工单类型")
     private String orderSmallType;
 
-    @ApiModelProperty(value = "工单类型名称")
+    @ApiModelProperty(value = "工单类型")
     private String orderSmallTypeText;
 
     @ApiModelProperty(value = "工单创建时间")

mall-server-api/src/main/java/com/gree/mall/manager/controller/letter/LetterProcessController.java

@@ -89,18 +89,18 @@ public class LetterProcessController {
     }
 
     @PostMapping("/updateLetter")
-    @ApiOperation("科室设置修改")
+    @ApiOperation("工作联络函修改")
     public ResponseHelper updateLetter(
-            @RequestBody LeDepartment leDepartment,
+            @RequestBody LeLetter leLetter,
             HttpServletRequest request
     ) throws ParseException {
-        letterLogic.updateLetter(leDepartment);
+        letterLogic.updateLetter(leLetter);
         return ResponseHelper.success();
     }
 
 
     @PostMapping("/delLetter")
-    @ApiOperation("科室设置删除")
+    @ApiOperation("工作联络函删除")
     public ResponseHelper delLetter(
             @ApiParam(value = "id", required = true) @RequestParam String id,
             HttpServletRequest request
@@ -110,4 +110,16 @@ public class LetterProcessController {
     }
 
 
+    @PostMapping("/send")
+    @ApiOperation("发送")
+    public ResponseHelper send(
+            @ApiParam(value = "id", required = true) @RequestParam List<String> ids,
+            HttpServletRequest request
+    ) throws ParseException {
+        letterLogic.send(ids);
+        return ResponseHelper.success();
+    }
+
+
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/enums/LetterStatusEnum.java

@@ -12,7 +12,12 @@ import lombok.Getter;
 public enum LetterStatusEnum implements BaseEnum {
 
     SEND("SEND","已发送"),
-    WAIT("WAIT","待发送"),
+    WAIT("WAIT","待执行"),
+    WAIT_EXAMINE("WAIT_EXAMINE","待执行"),
+    EXECUTED("EXECUTED","已执行"),
+    REVOKE("REVOKE","已撤销"),
+    REDUCTION("REDUCTION","已减免"),
+    CANCEL("CANCEL","已作废"),
     ;
 
     @EnumValue

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

@@ -9,6 +9,7 @@ import com.gree.mall.manager.bean.letter.LeProjectVO;
 import com.gree.mall.manager.bean.letter.LeUserDepartmentVO;
 import com.gree.mall.manager.bean.policy.PolicyOrderVO;
 import com.gree.mall.manager.commonmapper.LetterMapper;
+import com.gree.mall.manager.enums.LetterStatusEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
@@ -255,9 +256,19 @@ public class LetterLogic {
         leLetter.insert();
     }
 
-    public void updateLetter(LeDepartment leDepartment) {
+    public void updateLetter(LeLetter leLetter) {
+        leLetter.updateById();
     }
 
     public void delLetter(String id) {
+        leLetterService.removeById(id);
+    }
+
+    public void send(List<String> ids) {
+        if (leLetterService.lambdaQuery().in(LeLetter::getLeLetterId,ids).ne(LeLetter::getStatus,"WAIT").count()>0)
+            throw new RemoteServiceException("存在有非待发送的联络函");
+        leLetterService.lambdaUpdate().in(LeLetter::getLeLetterId,ids)
+                .set(LeLetter::getStatus, LetterStatusEnum.EXECUTED.getKey()).update();
+
     }
 }