jinshihui преди 2 дни
родител
ревизия
d06367d116

+ 2 - 2
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TOrderController.java

@@ -147,7 +147,7 @@ public class TOrderController extends BaseController {
 
 
     /**
-     * 取消订单申请
+     * 退单申请
      *
      * 业务流程:
      * 1. 用户在订单详情页点击"取消订单"按钮
@@ -161,7 +161,7 @@ public class TOrderController extends BaseController {
      * @return R
      */
     //@Log(title = "取消订单申请", businessType = BusinessType.UPDATE)
-    @ApiOperation("取消订单申请")
+    @ApiOperation("退单申请")
     @RequestMapping(value = "wx/applyCancle", method = RequestMethod.POST)
     public R applyCancle(@RequestBody TOrder order) {
         try {

+ 28 - 0
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TXiangmuController.java

@@ -72,6 +72,34 @@ public class TXiangmuController {
     }
 
 
+    /**
+     * 查询指定技师的项目
+     *
+     * @param jsId 技师ID
+     * @return R<List<TXiangmu>>
+     */
+    @GetMapping(value = "wx/getByJsId")
+    @ApiOperation("查询指定技师的项目")
+    public R<List<TXiangmu>> getByJsId(@RequestParam String jsId) {
+        try {
+            log.info("查询指定技师的项目,技师ID:{}", jsId);
+            //通过技师ID查询技师项目编号
+            TJs js = jsService.getById(jsId);
+            String bhList = js.getcBhList();
+            if (StringUtils.isBlank(bhList)) {
+                return R.fail("该技师没有项目");
+            }
+            LambdaQueryWrapper<TXiangmu> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            objectLambdaQueryWrapper.in(TXiangmu::getcId, bhList.split(","));
+            List<TXiangmu> list = xiangmuService.list(objectLambdaQueryWrapper);
+            return R.ok(list);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
+
     /**
      * 推荐技师
      *

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

@@ -78,7 +78,6 @@ public class TJs implements Serializable {
 
     /**
      * 可预约项目编号列表
-     * 以JSON数组格式存储,表示技师可提供的服务项目编号集合
      */
     @TableField(value = "c_bh_list")
     @ApiModelProperty("可预约项目编号列表")