no message

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

@@ -180,12 +180,15 @@ public class MemberController {
     @PostMapping("/worker/examine")
     @ApiOperation(value = "工程师审核-v2")
     public ResponseHelper examineWorker(
-            @RequestParam String id,
-            @ApiParam("审核状态 OK=通过 FAIL=驳回 ") @RequestParam ExamineStatusEnum examineStatusEnum,
-            @ApiParam(value = "审核备注", required = false) @RequestParam(required = false) String examineRemark
+            @RequestBody UserApplyWorkerBean bean
+//            @RequestParam String id,
+//            @ApiParam("审核状态 OK=通过 FAIL=驳回 ") @RequestParam ExamineStatusEnum examineStatusEnum,
+//            @ApiParam(value = "审核备注", required = false) @RequestParam(required = false) String examineRemark
     ) {
         //userLogic.
-        userLogic.examine(id, examineStatusEnum, examineRemark);
+        userLogic.updateWorker(bean.getUserId(), bean.getWebsitId(), bean.getNickName(), bean.getIdCard(), bean.getIdCardImg(),
+                bean.getBankAccount(), bean.getIsEs(), bean.getWorkerNumber());
+        userLogic.examine(bean.getId(), bean.getExamineStatus(), bean.getExamineRemark());
         return ResponseHelper.success();
     }
 

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

@@ -86,7 +86,7 @@ public class RepairSettleAccountLogic {
             throw new RemoteServiceException("身份证在系统不存在:" + idcard);
         }
         if (!dailyBankAccount.getDepositBank().contains("招商银行") && StringUtils.isBlank(dailyBankAccount.getBankAddr())) {
-            throw new RemoteServiceException("卡号【" + dailyBankAccount.getBankAccount() + "】非招商银行，请补充开户行地址");
+            throw new RemoteServiceException("卡号【" + dailyBankAccount.getBankAccount() + "】非招商银行，请补充开户行");
         }
         dailyBankAccount.setBankAccount(dailyBankAccount.getBankAccount().replaceAll(" ", ""));
 

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

@@ -306,7 +306,7 @@ public class UserLogic {
      * @Param examineRemark 审核备注
      */
     @Transactional
-    public void examine(String id, ExamineStatusEnum examineStatus, String examineRemark) {
+    public void examine(String id, String examineStatus, String examineRemark) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         WebsitUser websitUser = websitUserService.getById(id);
         if (!StringUtils.equals(websitUser.getExamineStatus(), ExamineStatusEnum.WAIT.getKey())) {
@@ -315,14 +315,14 @@ public class UserLogic {
         if (StringUtils.isBlank(websitUser.getWorkerNumber())) {
             throw new RemoteServiceException("师傅编号不能为空");
         }
-        websitUser.setExamineStatus(examineStatus.getKey());
+        websitUser.setExamineStatus(examineStatus);
         websitUser.setExamineTime(new Date());
         websitUser.setExamineBy(adminUser.getNickName());
         websitUser.setExamineRemark(examineRemark);
         websitUser.updateById();
 
         User user = userService.getById(websitUser.getUserId());
-        if (examineStatus.getKey().equals(ExamineStatusEnum.OK.getKey())) {
+        if (examineStatus.equals(ExamineStatusEnum.OK.getKey())) {
             user.setType(UserTypeEnum.WORKER.getKey());
         }
         user.updateById();