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

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

@@ -126,26 +126,8 @@ public class ProductOrderController extends BaseController {
     @ApiOperation("订单确认收货接口")
     @PutMapping("/confirm/receipt")
     public R confirmReceipt(@Validated @RequestBody ProductOrderOperateDTO dto) {
-        boolean bool = this.productOrderInfoService.confirmReceipt(dto);
-        if (bool) {
-            return R.ok();
-        }
-        return R.fail();
-    }
-
-    /**
-     * 取消退货
-     * @param dto
-     * @return R
-     */
-    @ApiOperation("取消退货")
-    @PutMapping("/cancel/return")
-    public R cancelReturn(@Validated @RequestBody ProductOrderOperateDTO dto) {
-        boolean bool = this.productOrderInfoService.cancelReturn(dto);
-        if (bool) {
-            return R.ok();
-        }
-        return R.fail();
+        this.productOrderInfoService.confirmReceipt(dto);
+        return R.ok();
     }
 
     @PreAuthorize("@ss.hasPermi('product:order:query')")

nightFragrance-massage/src/main/java/com/ylx/massage/domain/dto/AfterSaleOrderDTO.java

@@ -19,15 +19,11 @@ public class AfterSaleOrderDTO {
     @ApiModelProperty(value = "订单编号", required = true)
     private String orderNo;
 
-    @NotNull(message = "收货状态不能为空")
-    @ApiModelProperty(value = "收货状态（1：未收货 2：已收货）", required = true)
-    private Integer receiptStatus;
-
     @NotNull(message = "申请原因不能为空")
     @ApiModelProperty(value = "申请原因", required = true)
     private String applyReason;
 
-    @ApiModelProperty(value = "售后类型 (1退货 2换货)")
+    @ApiModelProperty(value = "售后类型 (1退货 2换货 3未收到货)")
     private Integer afterSaleType;
 
     @ApiModelProperty(value = "问题描述")

nightFragrance-massage/src/main/java/com/ylx/massage/service/IProductOrderInfoService.java

@@ -55,9 +55,7 @@ public interface IProductOrderInfoService extends IService<ProductOrderInfo> {
      */
     R<?> cancelOrder(ProductOrderCancelRequest request);
 
-    boolean confirmReceipt(ProductOrderOperateDTO dto);
-
-    boolean cancelReturn(ProductOrderOperateDTO dto);
+    void confirmReceipt(ProductOrderOperateDTO dto);
 
     Page<ProductOrderPageItemVo> adminPage(Page<ProductOrderInfo> page, ProductOrderPageDTO dto);
 

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

@@ -67,7 +67,7 @@ public class AfterSaleOrderServiceImpl extends ServiceImpl<AfterSaleOrderMapper,
 
         boolean updateResult = this.productOrderInfoService.updateById(updateInfo);
         if (!updateResult) {
-            throw new ServiceException("订单状态已变更，请刷新后重试");
+            throw new ServiceException("订单状态变更失败");
         }
     }
 
@@ -123,11 +123,13 @@ public class AfterSaleOrderServiceImpl extends ServiceImpl<AfterSaleOrderMapper,
             throw new ServiceException("订单状态异常，仅售后中状态可取消售后");
         }
 
-        // 4. 取消售后订单
+        // 4. 取消售后订单(待审核 或 等待用户寄回)
         LambdaQueryWrapper<AfterSaleOrder> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AfterSaleOrder::getOrderId, orderId)
                 .eq(AfterSaleOrder::getOpenId, loginUser.getCOpenid())
-                .eq(AfterSaleOrder::getAfterSaleStatus, AfterSaleStatusEnum.WAIT_AUDIT.getCode());
+                .in(AfterSaleOrder::getAfterSaleStatus,
+                        AfterSaleStatusEnum.WAIT_AUDIT.getCode(),
+                        AfterSaleStatusEnum.WAITING_USER_RETURN.getCode());
 
         AfterSaleOrder afterSaleOrder = this.afterSaleOrderMapper.selectOne(queryWrapper);
         if (ObjectUtil.isNull(afterSaleOrder)) {
@@ -150,7 +152,7 @@ public class AfterSaleOrderServiceImpl extends ServiceImpl<AfterSaleOrderMapper,
 
         boolean orderUpdateResult = this.productOrderInfoService.updateById(updateInfo);
         if (!orderUpdateResult) {
-            throw new ServiceException("订单状态已变更，请刷新后重试");
+            throw new ServiceException("订单状态变更失败");
         }
     }
 

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

@@ -73,9 +73,6 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
 
     @Resource
     private IAfterSaleOrderService afterSaleOrderService;
-    @Resource
-    private TAddressService addressService;
-
 
     /**
      * 创建商品订单
@@ -571,7 +568,7 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean confirmReceipt(ProductOrderOperateDTO dto) {
+    public void confirmReceipt(ProductOrderOperateDTO dto) {
 
         // 1. 获取当前登录用户（公共方法提取）
         WxLoginUser loginUser = getCurrentWxLoginUser();
@@ -584,33 +581,24 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
             throw new ServiceException("订单状态异常，仅待收货状态可确认收货");
         }
 
-        // 修改订单信息
+        // 4. 修改订单信息
+        ProductOrderInfo updateInfo = new ProductOrderInfo();
+        updateInfo.setId(productOrderInfo.getId());
         LocalDateTime now = LocalDateTime.now();
-        productOrderInfo.setOrderStatus(ProductOrderStatusEnum.RECEIVED.getCode());
-        productOrderInfo.setReceiveTime(now);
-        productOrderInfo.setUpdateTime(now);
-        return this.updateById(productOrderInfo);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean cancelReturn(ProductOrderOperateDTO dto) {
-
-        // 1. 获取当前登录用户（公共方法提取）
-        WxLoginUser loginUser = getCurrentWxLoginUser();
+        updateInfo.setOrderStatus(ProductOrderStatusEnum.RECEIVED.getCode());
+        updateInfo.setReceiveTime(now);
+        updateInfo.setUpdateTime(now);
+        boolean orderUpdateResult = this.updateById(updateInfo);
+        if (!orderUpdateResult) {
+            throw new ServiceException("订单状态变更失败");
+        }
 
-        // 2. 查询并校验订单（公共方法提取）
-        ProductOrderInfo productOrderInfo = getAndCheckOrder(dto.getOrderId(), loginUser.getCOpenid());
+        // 5. 修改用户售后单
+        LambdaQueryWrapper<AfterSaleOrder> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AfterSaleOrder::getOrderId, productOrderInfo.getId());
+//        this.afterSaleOrderService.updateById()
 
-        // 3. 状态校验：必须是 退货中/退款中 才能取消退货
-        /*if (!ProductOrderStatusEnum.RETURNING.getCode().equals(productOrderInfo.getOrderStatus())) {
-            throw new ServiceException("订单状态异常，仅退货中状态可取消退货");
-        }*/
-        // 修改订单信息
-        LocalDateTime now = LocalDateTime.now();
-        productOrderInfo.setOrderStatus(ProductOrderStatusEnum.WAIT_RECEIVE.getCode());
-        productOrderInfo.setUpdateTime(now);
-        return this.updateById(productOrderInfo);
+        // 6. TODO 积分增加
     }
 
     @Override