fix:1.技师上岗/下岗接口2.提现记录增加筛选条件

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

@@ -138,6 +138,21 @@ public class TJsController extends BaseController {
         }
     }
 
+    @Log(title = "上岗/下岗", businessType = BusinessType.UPDATE)
+    @RequestMapping(value = "wx/post", method = RequestMethod.POST)
+    @ApiOperation("上岗/下岗")
+    public R upPost(@RequestBody TJs js) {
+        try {
+            return R.ok(jsService.upPost(js));
+        } catch (ServiceException s) {
+            log.error(s.toString());
+            return R.fail(s.getMessage());
+        } catch (Exception e) {
+            log.error(e.toString());
+            return R.fail("系统异常");
+        }
+    }
+
     /**
      * 微信查询
      *

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

@@ -1,6 +1,7 @@
 package com.ylx.web.controller.massage;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.core.domain.R;
 import com.ylx.common.exception.ServiceException;
@@ -76,6 +77,8 @@ public class TTxRecordController {
         // 获取页数
         LambdaQueryWrapper<TTxRecord> tTxRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
         tTxRecordLambdaQueryWrapper.eq(null != txRecord.getnStatus(), TTxRecord::getnStatus, txRecord.getnStatus()).
+                eq(StringUtils.isNotBlank(txRecord.getcPhone()), TTxRecord::getcPhone, txRecord.getcPhone()).
+                eq(StringUtils.isNotBlank(txRecord.getcName()), TTxRecord::getcName, txRecord.getcName()).
                 orderByDesc(TTxRecord::getDtCreateTime);
         return R.ok(recordService.page(page, tTxRecordLambdaQueryWrapper));
     }

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TJs.java

@@ -184,14 +184,14 @@ public class TJs implements Serializable {
      * 服务状态	0 可服务	1 服务中 2不可服务
      */
     @TableField("n_status")
-    @ApiModelProperty("服务状态\t0 可服务\t1 服务中")
+    @ApiModelProperty("服务状态\t0 可服务\t1 服务中 2不可服务")
     private Integer nStatus;
 
     /**
      * 上岗状态 0未上岗 1已上岗
      */
     @TableField("n_status2")
-    @ApiModelProperty("上岗状态 0未上岗 1已上岗")
+    @ApiModelProperty("上岗状态 -1未上岗 0已上岗")
     private Integer nStatus2;
 
     /**

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/TJsMapper.java

@@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.ylx.massage.domain.TJs;
 
-import java.util.List;
 
 /**
  * 技师表 Mapper 接口

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

@@ -25,4 +25,6 @@ public interface TJsService extends IService<TJs> {
     boolean updateLocation(TJs js);
 
     void newOrderNotification(String openId);
+
+    boolean upPost(TJs js);
 }

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

@@ -13,6 +13,7 @@ import com.ylx.common.utils.StringUtils;
 import com.ylx.massage.domain.*;
 import com.ylx.massage.domain.vo.TJsVo;
 import com.ylx.massage.enums.JsStatusEnum;
+import com.ylx.massage.enums.OrderStatusEnum;
 import com.ylx.massage.mapper.TJsMapper;
 import com.ylx.massage.service.*;
 import com.ylx.massage.utils.LocationUtil;
@@ -27,6 +28,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -56,6 +58,9 @@ public class TJsServiceImpl extends ServiceImpl<TJsMapper, TJs> implements TJsSe
     @Resource
     private WeChatUtil weChatUtil;
 
+    @Resource
+    private TOrderService orderService;
+
 
     @Override
     public Page<TJs> getAll(Page<TJs> page, TJsVo param) {
@@ -152,6 +157,30 @@ public class TJsServiceImpl extends ServiceImpl<TJsMapper, TJs> implements TJsSe
 
     }
     @Override
+    public boolean upPost(TJs js) {
+
+        if (StringUtils.isBlank(js.getId())) {
+            throw new ServiceException("技师ID不能为空");
+        }
+        if (js.getnStatus2() == null) {
+            throw new ServiceException("岗位状态不能为空");
+        }
+        //上岗
+        if (Objects.equals(js.getnStatus2(), JsStatusEnum.POST_ON_DUTY.getCode())) {
+            //岗位状态为1时，设置nStatus为1
+            js.setnStatus(JsStatusEnum.JS_SERVICEABLE.getCode());
+        }
+        if (Objects.equals(js.getnStatus2(), JsStatusEnum.POST_NOT_ON_DUTY.getCode())) {
+            //判断该技师是否有服务中的订单
+            List<TOrder> list = orderService.list(new LambdaQueryWrapper<TOrder>().eq(TOrder::getnStatus, OrderStatusEnum.SERVICE).eq(TOrder::getcJsId, js.getId()));
+            if (!list.isEmpty()) {
+                throw new ServiceException("您有服务中的订单，不能下岗");
+            }
+            js.setnStatus(JsStatusEnum.JS_NO_SERVICE.getCode());
+        }
+        return this.updateById(js);
+    }
+    @Override
     public TJs getByJsId(String jsId, String openId) {
         if (jsId == null || jsId.trim().isEmpty()) {
             // 处理空或空白的jsId