fix:优化执行顺序

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

@@ -145,6 +145,7 @@ public class TJsController extends BaseController {
      * @return
      */
     @RequestMapping(value = "wx/select", method = RequestMethod.GET)
+    @Log(title = "微信查询技师列表", businessType = BusinessType.OTHER)
     @ApiOperation("微信查询")
     public R wxSelect(Page<TJs> page, TJsVo js) {
         try {

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

@@ -232,7 +232,6 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         if (order.getPayType().equals(MassageConstants.INTEGER_ONE)) {
             //微信支付
             R resp = rechargeService.getPay(orderNew.getOrderNo(), orderNew.getTotalPrice(), orderNew.getcOpenId(), BillTypeEnum.WX_PAY.getInfo(), BillTypeEnum.WX_PAY.getCode().toString());
-            this.newOrderNotification(orderNew);
             return resp;
         }
 
@@ -245,7 +244,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             throw new ServiceException("账户金额不够请充值");
         } else {
             orderPayManage(user, orderNew);
-            this.newOrderNotification(orderNew);
+
             return R.ok();
         }
     }
@@ -256,7 +255,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         cn.hutool.json.JSONObject param = JSONUtil.createObj();
         //订单号
         param.set("character_string9", JSONUtil.createObj().set("value", order.getOrderNo()));
-        //点话
+        //电话
         param.set("phone_number14", JSONUtil.createObj().set("value", order.getcPhone()));
         param.set("thing18", JSONUtil.createObj().set("value", order.getcName()));
         param.set("time6", JSONUtil.createObj().set("value", DateTimeUtils.formatDate(new Date(), DateTimeUtils.DATE_NUMBER_YEAR_MONTH_FORMAT)));
@@ -317,6 +316,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         //更新及技师状态
         updateJs(orderNew);
         updateById(orderParam);
+        this.newOrderNotification(orderNew);
     }
 
     /**
@@ -370,6 +370,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         TOrder orderParam = new TOrder();
         orderParam.setcId(orderNew.getcId());
         orderParam.setnStatus(OrderStatusEnum.REFUSE.getCode());
+        updateJs(orderNew);
         return updateById(orderParam);
     }
 
@@ -569,11 +570,20 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             throw new IllegalStateException("无法找到对应的技师");
         }
 
-        // 更新技师状态
-        js.setnStatus(JsStatusEnum.JS_SERVICE.getCode());
-        // 确保js.getnNum()不为null，避免 NullPointerException
-        int num = js.getnNum() == null ? 0 : js.getnNum();
-        js.setnNum(num + MassageConstants.INTEGER_ONE);
+        if (Objects.equals(js.getnStatus(), JsStatusEnum.JS_SERVICEABLE.getCode())) {
+            // 更新技师状态
+            js.setnStatus(JsStatusEnum.JS_SERVICE.getCode());
+            // 确保js.getnNum()不为null，避免 NullPointerException
+            int num = js.getnNum() == null ? 0 : js.getnNum();
+            js.setnNum(num + MassageConstants.INTEGER_ONE);
+        } else {
+            // 更新技师状态
+            js.setnStatus(JsStatusEnum.JS_SERVICEABLE.getCode());
+            // 确保js.getnNum()不为null，避免 NullPointerException
+            int num = js.getnNum() == null ? 0 : js.getnNum();
+            js.setnNum(num - MassageConstants.INTEGER_ONE);
+        }
         jsService.updateById(js);
     }
+
 }