fix:拉黑恢复

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TJsController.java

@@ -295,6 +295,20 @@ public class TJsController extends BaseController {
         }
     }
 
+    @ApiOperation("拉黑")
+    @RequestMapping(value = "/block", method = RequestMethod.POST)
+    public R block(@RequestBody TJs js) {
+        try {
+            return R.ok(jsService.block(js));
+        } catch (ServiceException s) {
+            log.error(s.getMessage());
+            return R.fail(s.getMessage());
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return R.fail("系统异常");
+        }
+    }
+
     @ApiOperation("小程序通知")
     @RequestMapping(value = "/tongzhi", method = RequestMethod.GET)
     public boolean sendSubscribeMessage(String openId) {

nightFragrance-massage/src/main/java/com/ylx/massage/enums/JsStatusEnum.java

@@ -19,7 +19,8 @@ public enum JsStatusEnum {
     /*** 技师审核状态*/
     JS_NOT_PASS(0, "待审核"),
     JS_PASS(1, "已通过"),
-    JS_RETURN(2, "已退回");
+    JS_RETURN(2, "已退回"),
+    BLOCKED(3, "已拉黑");
 
 
     private final Integer code;

nightFragrance-massage/src/main/java/com/ylx/massage/service/TJsService.java

@@ -29,4 +29,6 @@ public interface TJsService extends IService<TJs> {
     boolean upPost(TJs js);
 
     void jsNotification(TJs js);
+
+    boolean block(TJs js);
 }

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TJsServiceImpl.java

@@ -222,6 +222,32 @@ public class TJsServiceImpl extends ServiceImpl<TJsMapper, TJs> implements TJsSe
         }
         return this.updateById(js);
     }
+
+    @Override
+    public boolean block(TJs js) {
+        if (StringUtils.isBlank(js.getId())) {
+            throw new ServiceException("技师ID不能为空");
+        }
+        if (js.getnTong() == null) {
+            throw new ServiceException("拉黑状态不能为空");
+        }
+        //恢复
+        if (Objects.equals(js.getnTong(), JsStatusEnum.JS_NOT_PASS.getCode())) {
+            //岗位状态为1时，设置nStatus为1
+            js.setnStatus(JsStatusEnum.JS_NO_SERVICE.getCode());
+        }
+        if (Objects.equals(js.getnTong(), JsStatusEnum.BLOCKED.getCode())) {
+
+            //判断该技师是否有服务中的订单
+            TJs js1 = this.getById(js.getId());
+            if (js1.getnStatus().equals(JsStatusEnum.JS_SERVICE.getCode())) {
+                throw new ServiceException("有服务中的订单，暂时不能拉黑");
+            }
+            js.setnStatus(JsStatusEnum.JS_NO_SERVICE.getCode());
+            js.setnStatus2(JsStatusEnum.POST_NOT_ON_DUTY.getCode());
+        }
+        return this.updateById(js);
+    }
     @Override
     public TJs getByJsId(String jsId, String openId) {
         if (jsId == null || jsId.trim().isEmpty()) {