修改bug

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

@@ -141,11 +141,11 @@ public class TFareSettingController extends BaseController {
      * @return R
      */
     @PostMapping("fareFreeRule/disable")
-    @ApiOperation("禁用免车费规则")
+    @ApiOperation("禁用（启用）免车费规则")
     public R disableFareFreeRule(@RequestBody DisableFareFreeRuleVo disableFareFreeRuleVo) {
         try {
             boolean success = fareFreeRuleService.disableFareFreeRule(disableFareFreeRuleVo.getOpenId(),disableFareFreeRuleVo.getEnable());
-            return success ? R.ok("操作成功") : R.fail("操作失败");
+            return success ? R.ok() : R.fail("操作失败");
         } catch (Exception e) {
             e.printStackTrace();
             return R.fail(e.getMessage());

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

@@ -113,7 +113,12 @@ public class TJsController extends BaseController {
     @RequestMapping(value = "wx/update", method = RequestMethod.POST)
     @ApiOperation("更新技师信息")
     public R wxUpdate(@RequestBody TJs js) {
-        return R.ok(jsService.wxUpdateJs(js));
+        try {
+            return R.ok(jsService.wxUpdateJs(js));
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
     }
 
 

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

@@ -152,7 +152,7 @@ public class TOrderController extends BaseController {
      *
      * 业务流程：
      * 1. 用户在订单详情页点击"取消订单"按钮
-     * 2. 填写退单原因（必填，最多50字符）
+     * 2. 填写退单原因
      * 3. 提交申请
      * 4. 系统创建退单申请记录，状态为待审核
      * 5. 等待客服审核

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

@@ -73,9 +73,9 @@ public class TXiangmuController {
 
 
     /**
-     * 查询指定技师的项目
+     * 查询指定技师的项目（H5端）
      *
-     * @param jsId 技师ID
+     * @param openId
      * @return R<List<TXiangmu>>
      */
     @GetMapping(value = "wx/getByJsId")
@@ -83,7 +83,7 @@ public class TXiangmuController {
     public R<List<TXiangmu>> getByJsId(@RequestParam String openId) {
         try {
             log.info("查询指定技师的项目，openId：{}", openId);
-            //通过openId查询技师项目编号
+            //通过openId查询技师信息
             TJs js = jsService.getOne(new LambdaQueryWrapper<TJs>().eq(TJs::getcOpenId, openId));
             if (js == null) {
                 return R.fail("该技师不存在");

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

@@ -356,10 +356,10 @@ public class TechnicianMomentController extends BaseController {
     }
 
     /**
-     * 根据动态ID查询动态简要详情
+     * 根据动态ID查询动态详情
      *
      * @param momentId 动态ID
-     * @return R
+     * @return R<MomentSimpleDetailVO>
      */
     @GetMapping("/simple/detail/{momentId}")
     @ApiOperation("根据动态ID查询动态简要详情")

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

@@ -276,6 +276,9 @@ public class TOrder implements Serializable {
     @ApiModelProperty("开始服务时间")
     private LocalDateTime startTime;
 
+    /**
+     * 开始服务时间字符串
+     */
     @TableField(exist = false)
     private String startTimeStr;
 

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/DisableFareFreeRuleVo.java

@@ -7,6 +7,7 @@ public class DisableFareFreeRuleVo implements Serializable {
 
     private static final long serialVersionUID = -2529697435273205568L;
 
+
     /**
      * 技师的openId
      */

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

@@ -54,26 +54,13 @@ public class CancelOrderApplicationServiceImpl extends ServiceImpl<com.ylx.massa
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String createApplication(String orderId, String cancelReason) {
-        log.info("开始创建退单申请，订单ID：{}，退单原因：{}", orderId, cancelReason);
-
-        // 1. 参数校验
-        if (StringUtils.isEmpty(orderId)) {
-            throw new ServiceException("订单ID不能为空");
-        }
-        if (StringUtils.isEmpty(cancelReason)) {
-            throw new ServiceException("退单原因不能为空");
-        }
-        if (cancelReason.length() > 50) {
-            throw new ServiceException("退单原因不能超过50个字符");
-        }
-
-        // 2. 查询订单信息
+        //  查询订单信息
         TOrder order = orderService.getById(orderId);
         if (order == null) {
             throw new ServiceException("订单不存在");
         }
 
-        // 3. 校验订单状态 - 只有进行中的订单才能申请退单
+        // 校验订单状态 - 只有进行中的订单才能申请退单
         // 进行中状态包括: 待接单(0)、已接单(1)、已出发(6)、已到达(2)、服务中(3)
         Integer currentStatus = order.getnStatus();
         log.info("订单当前状态：{}", currentStatus);
@@ -81,20 +68,20 @@ public class CancelOrderApplicationServiceImpl extends ServiceImpl<com.ylx.massa
             throw new ServiceException("当前订单状态不允许申请退单，只有进行中的订单可以申请退单");
         }
 
-        // 4. 检查是否已有待审核的退单申请
+        // 检查是否已有待审核的退单申请
         CancelOrderApplication existingApplication = getInfoByOrderId(orderId);
         if (existingApplication != null && existingApplication.getAuditStatus() == 0) {
             throw new ServiceException("该订单已有待审核的退单申请，请勿重复提交");
         }
 
 
-        // 6. 查询技师信息
+        //  查询技师信息
         TJs technician = null;
         if (StringUtils.isNotEmpty(order.getcJsId())) {
             technician = jsService.getById(order.getcJsId());
         }
 
-        // 7. 构建退单申请记录
+        // 构建退单申请记录
         CancelOrderApplication application = new CancelOrderApplication();
         application.setOrderId(order.getcId());
         application.setOrderNo(order.getOrderNo());
@@ -105,7 +92,7 @@ public class CancelOrderApplicationServiceImpl extends ServiceImpl<com.ylx.massa
         application.setTechName(technician != null ? technician.getcName() : null);
         application.setTechNickName(technician != null ? technician.getcNickName() : null);
         // 设置技师手机号
-        application.setTechPhone(technician != null ? technician.getcPhone() : null);
+        application.setTechPhone(technician.getcPhone());
 
         // 从订单明细中提取项目名称
         String projectName = extractProjectName(order);
@@ -119,6 +106,8 @@ public class CancelOrderApplicationServiceImpl extends ServiceImpl<com.ylx.massa
         application.setOrderAmount(order.getTotalPrice() != null ? order.getTotalPrice() : BigDecimal.ZERO);
         //application.setRefundAmount(order.getTotalPrice() != null ? order.getTotalPrice() : BigDecimal.ZERO);
 
+
+
         // 保存订单原始状态，用于取消申请时恢复订单状态
         application.setOrderStatus(currentStatus);
 
@@ -130,7 +119,6 @@ public class CancelOrderApplicationServiceImpl extends ServiceImpl<com.ylx.massa
         // 设置创建时间
         application.setCreateTime(LocalDateTime.now());
         application.setUpdateTime(LocalDateTime.now());
-        application.setIsDelete(0);
 
         // 8. 保存退单申请记录
         boolean saved = this.save(application);

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

@@ -160,17 +160,14 @@ public class TFareFreeRuleServiceImpl extends ServiceImpl<TFareFreeRuleMapper, T
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean disableFareFreeRule(String openId,String enable) {
-        //  参数校验
-        if (StringUtils.isBlank(openId)) {
-            throw new ServiceException("openId不能为空");
-        }
         //根据openId查询技师信息
         TJs js = jsService.getOne(new LambdaQueryWrapper<TJs>().eq(TJs::getcOpenId, openId));
         if (js == null) {
             throw new ServiceException("技师不存在");
         }
         String techId = js.getId();
-        TFareFreeRule existingRule = this.getOne(new LambdaQueryWrapper<TFareFreeRule>().eq(TFareFreeRule::getTechId, techId));
+        LambdaQueryWrapper<TFareFreeRule> eq = new LambdaQueryWrapper<TFareFreeRule>().eq(TFareFreeRule::getTechId, techId).orderByDesc(TFareFreeRule::getCreateTime).last("limit 1");
+        TFareFreeRule existingRule = this.getOne(eq);
         if (existingRule == null) {
             throw new ServiceException("免车费规则不存在");
         }
@@ -275,12 +272,12 @@ public class TFareFreeRuleServiceImpl extends ServiceImpl<TFareFreeRuleMapper, T
         if(StringUtils.isBlank(fareFreeRule.getOpenId())){
             throw new ServiceException("openID不能为空");
         }
-        // 1. 校验服务项目
+        // 校验服务项目
         if (StringUtils.isBlank(fareFreeRule.getProjectId())) {
             throw new ServiceException("请至少选择一个服务项目");
         }
 
-        // 2. 校验时间段
+        //  校验时间段
         if (StringUtils.isBlank(fareFreeRule.getTimeRange1())) {
             throw new ServiceException("服务时间段1不能为空");
         }
@@ -289,7 +286,7 @@ public class TFareFreeRuleServiceImpl extends ServiceImpl<TFareFreeRuleMapper, T
             throw new ServiceException("服务时间段2不能为空");
         }
 
-        // 3. 校验时间段格式
+        // 校验时间段格式
         // 校验时间格式
         if (!fareFreeRule.getTimeRange1().matches("^([0-1]?[0-9]|2[0-3]):[0-5][0-9]-([0-1]?[0-9]|2[0-3]):[0-5][0-9]$")) {
             throw new ServiceException("时间格式错误，请使用 HH:mm 格式（如：08:00）");
@@ -299,12 +296,12 @@ public class TFareFreeRuleServiceImpl extends ServiceImpl<TFareFreeRuleMapper, T
             throw new ServiceException("时间格式错误，请使用 HH:mm 格式（如：08:00）");
         }
 
-        // 4. 校验距离
+        // 校验距离
         if (fareFreeRule.getMinDistance() == null || fareFreeRule.getMinDistance() <= 0) {
             throw new ServiceException("订单距离必须大于0");
         }
 
-        // 5. 校验是否启用
+        // 校验是否启用
         if (fareFreeRule.getEnable() == null || (!"0".equals(fareFreeRule.getEnable()) && !"1".equals(fareFreeRule.getEnable()))) {
             throw new ServiceException("是否启用参数错误");
         }

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

@@ -326,6 +326,15 @@ public class TJsServiceImpl extends ServiceImpl<TJsMapper, TJs> implements TJsSe
         /*if (js.getCity() == null) {
             throw new ServiceException("所在城市不能为空");
         }*/
+        //判断生活照图片列表不能为空
+        if (js.getcImgList() == null || js.getcImgList().isEmpty()) {
+            throw new ServiceException("生活照图片列表不能为空");
+        }
+        //判断身份证图片列表不能为空
+        if (js.getcSfzImg() == null || js.getcSfzImg().isEmpty()) {
+            throw new ServiceException("身份证图片列表不能为空");
+        }
+
         //判断虚拟订单数量不能为空
         if (js.getVirtualOrderNumber() == null) {
             throw new ServiceException("虚拟订单数量不能为空");

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

@@ -1286,7 +1286,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             throw new ServiceException("退单原因不能为空");
         }
 
-        // 2. 查询订单信息
+        // 2. 根据订单ID查询订单信息
         TOrder existingOrder = this.getById(cId);
         if (existingOrder == null) {
             throw new ServiceException("订单不存在");