Merge remote-tracking branch 'origin/point_dev' into point_dev

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

@@ -7,24 +7,19 @@ import lombok.Getter;
 @Getter
 public enum AfterSaleStatusEnum {
 
-    /**
-     * 待审核
-     */
     WAIT_AUDIT(0, "待审核"),
 
-    AGREE_RETURN(1, "同意退货/换货"),
+    REFUND_COMPLETED(1, "退款完成"),
 
-    REFUND_COMPLETED(2, "退款完成"),
+    WAITING_USER_RETURN(2, "等待用户寄回"),
 
-    WAITING_USER_RETURN(3, "等待用户寄回"),
+    WAITING_MERCHANT_RECEIVE(3, "等待商家收货"),
 
-    WAITING_MERCHANT_RECEIVE(4, "等待商家收货"),
+    WAITING_MERCHANT_SHIP(4, "等待商家寄出"),
 
-    WAITING_MERCHANT_SHIP(5, "等待商家寄出"),
+    COMPLETED(5, "订单完成"),
 
-    COMPLETED(6, "订单完成"),
-
-    CANCELLED(7, "售后取消");
+    CANCELLED(6, "售后取消");
 
     private final Integer code;
 

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

@@ -86,21 +86,21 @@ public class AfterSaleOrderServiceImpl extends ServiceImpl<AfterSaleOrderMapper,
             throw new IllegalArgumentException("售后单ID不能为空");
         }
 
-        // 2. 获取“同意退货/换货”的售后单
+        // 2. 获取“等待用户寄回”的售后单
         LambdaQueryWrapper<AfterSaleOrder> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AfterSaleOrder::getId, id)
-                .eq(AfterSaleOrder::getAfterSaleStatus, AfterSaleStatusEnum.AGREE_RETURN.getCode());
+                .eq(AfterSaleOrder::getAfterSaleStatus, AfterSaleStatusEnum.WAITING_USER_RETURN.getCode());
 
         AfterSaleOrder afterSaleOrder = this.afterSaleOrderMapper.selectOne(queryWrapper);
         if (ObjectUtil.isNull(afterSaleOrder)) {
-            throw new ServiceException("同意退货/换货的售后单不存在");
+            throw new ServiceException("等待用户寄回售后单不存在");
         }
 
         AfterSaleOrder updateInfo = new AfterSaleOrder();
         updateInfo.setId(id);
         updateInfo.setLogisticsNo(dto.getLogisticsNo());
         updateInfo.setUpdateTime(LocalDateTime.now());
-        updateInfo.setAfterSaleStatus(AfterSaleStatusEnum.WAITING_USER_RETURN.getCode());
+        updateInfo.setAfterSaleStatus(AfterSaleStatusEnum.WAITING_MERCHANT_RECEIVE.getCode());
 
         boolean updateResult = this.updateById(updateInfo);
         if (!updateResult) {
@@ -174,11 +174,11 @@ public class AfterSaleOrderServiceImpl extends ServiceImpl<AfterSaleOrderMapper,
         LambdaQueryWrapper<AfterSaleOrder> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AfterSaleOrder::getOrderId, orderId)
                 .eq(AfterSaleOrder::getOpenId, loginUser.getCOpenid())
-                .eq(AfterSaleOrder::getAfterSaleStatus, AfterSaleStatusEnum.AGREE_RETURN.getCode());
+                .eq(AfterSaleOrder::getAfterSaleStatus, AfterSaleStatusEnum.WAITING_USER_RETURN.getCode());
 
         AfterSaleOrder afterSaleOrder = this.afterSaleOrderMapper.selectOne(queryWrapper);
         if (ObjectUtil.isNull(afterSaleOrder)) {
-            throw new ServiceException("同意退货/换货的售后单不存在");
+            throw new ServiceException("等待用户寄回售后单不存在");
         }
 
         // 4. 更新售后单信息
@@ -186,7 +186,7 @@ public class AfterSaleOrderServiceImpl extends ServiceImpl<AfterSaleOrderMapper,
         updateInfo.setId(afterSaleOrder.getId());
         updateInfo.setLogisticsNo(dto.getLogisticsNo());
         updateInfo.setUpdateTime(LocalDateTime.now());
-        updateInfo.setAfterSaleStatus(AfterSaleStatusEnum.WAITING_USER_RETURN.getCode());
+        updateInfo.setAfterSaleStatus(AfterSaleStatusEnum.WAITING_MERCHANT_RECEIVE.getCode());
 
         boolean updateResult = this.updateById(updateInfo);
         if (!updateResult) {