修改bug

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

@@ -151,6 +151,8 @@ public class CancelOrderApplicationController extends BaseController {
                     projectNameBuffer.append(object.getString("cTitle")).append(" ");
                     projectDuration = projectDuration.add(object.getBigDecimal("nMinute"));
                 }
+                // 设置退单原因
+                vo.setCancelOrderReason(application.getCancelOrderReason());
                 // 设置项目名称
                 vo.setProjectName(projectNameBuffer.toString().trim());
                 // 设置项目时长

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

@@ -500,7 +500,7 @@ public class TOrder implements Serializable {
      * 非数据库字段，用于展示订单状态的文本描述
      */
     @TableField(exist = false)
-    @Excel(name = "订单状态")
+    @Excel(name = "订单状态名称")
     @ApiModelProperty("订单状态名称")
     private String statusName;
 

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

@@ -18,6 +18,11 @@ public class CancelOrderApplicationDetailVo extends TOrder {
     @JsonProperty(index = 0)
     private String id;
 
+    /**
+     * 退单原因（申请备注）
+     */
+    private String cancelOrderReason;
+
     /**
      * 项目名称
      */

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

@@ -584,7 +584,6 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         }
         TJs js = jsService.getById(orderNew.getcJsId());
         if (StringUtils.isBlank(orderNew.getParentNo())) {
-
             if (null == js || js.getnStatus().equals(JsStatusEnum.JS_SERVICE.getCode())) {
                 throw new ServiceException("该技师已在服务中请重新下单");
             }