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

@@ -132,7 +132,12 @@ public class ProductOrderController extends BaseController {
         return R.fail();
     }
 
-    @ApiOperation("取消退货接口接口")
+    /**
+     * 取消退货
+     * @param dto
+     * @return R
+     */
+    @ApiOperation("取消退货")
     @PutMapping("/cancel/return")
     public R cancelReturn(@Validated @RequestBody ProductOrderOperateDTO dto) {
         boolean bool = this.productOrderInfoService.cancelReturn(dto);

nightFragrance-admin/src/main/resources/application-dev.yml

@@ -55,11 +55,6 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
     druid:
-      # 主库数据源
-#      master:
-#        url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#        username: root
-#        password: 1234
       master:
         url: jdbc:mysql://39.98.239.48:3366/night_fragrance?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
@@ -129,9 +124,7 @@ spring:
       enabled: false
   # redis 配置
   redis:
-    # 地址
     host: 127.0.0.1
-    # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 1

nightFragrance-massage/src/main/java/com/ylx/massage/enums/AfterSaleStatusEnum.java

@@ -5,6 +5,9 @@ import lombok.Getter;
 @Getter
 public enum AfterSaleStatusEnum {
 
+    /**
+     * 待审核
+     */
     WAIT_AUDIT(0, "待审核"),
 
     AGREE_RETURN(1, "同意退货/换货"),

nightFragrance-massage/src/main/java/com/ylx/massage/enums/ProductOrderStatusEnum.java

@@ -22,11 +22,6 @@ public enum ProductOrderStatusEnum {
      */
     WAIT_DELIVERY(1, "待发货"),
 
-    /**
-     * 售后中
-     */
-    AFTER_SALES(4, "售后中"),
-
     /**
      * 待收货
      */
@@ -38,34 +33,9 @@ public enum ProductOrderStatusEnum {
     RECEIVED(3, "已收货"),
 
     /**
-     * 换货待审核
-     */
-    EXCHANGE_PENDING(5, "换货待审核"),
-
-    /**
-     * 换货中
-     */
-    EXCHANGING(6, "换货中"),
-
-    /**
-     * 退货待审核
-     */
-    RETURN_PENDING(7, "退货待审核"),
-
-    /**
-     * 退货中
-     */
-    RETURNING(8, "退货中"),
-
-    /**
-     * 退款中
-     */
-    REFUNDING(9, "退款中"),
-
-    /**
-     * 退款完成
+     * 售后中
      */
-    REFUND_COMPLETE(10, "退款完成"),
+    AFTER_SALES(4, "售后中"),
 
     /**
      * 已取消

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

@@ -478,9 +478,9 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
         ProductOrderInfo productOrderInfo = getAndCheckOrder(dto.getOrderId(), loginUser.getCOpenid());
 
         // 3. 状态校验：必须是 退货中/退款中 才能取消退货
-        if (!ProductOrderStatusEnum.RETURNING.getCode().equals(productOrderInfo.getOrderStatus())) {
+        /*if (!ProductOrderStatusEnum.RETURNING.getCode().equals(productOrderInfo.getOrderStatus())) {
             throw new ServiceException("订单状态异常，仅退货中状态可取消退货");
-        }
+        }*/
         // 修改订单信息
         LocalDateTime now = LocalDateTime.now();
         productOrderInfo.setOrderStatus(ProductOrderStatusEnum.WAIT_RECEIVE.getCode());