“订单确认收货接口”、“取消退货接口接口”接口代码调整

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

@@ -66,7 +66,7 @@ public class ProductOrderController extends BaseController {
     /**
      * 查询我的订单列表（分页）
      *
-     * @param page 分页参数
+     * @param page   分页参数
      * @param openId 用户openId
      * @return R<Page<ProductOrderListVo>> 订单分页列表
      */
@@ -85,7 +85,7 @@ public class ProductOrderController extends BaseController {
     /**
      * 查询商品订单详情
      *
-     * @param openId 用户openId
+     * @param openId  用户openId
      * @param orderNo 订单编号
      * @return R<ProductOrderDetailVo> 订单详情
      */
@@ -104,14 +104,20 @@ public class ProductOrderController extends BaseController {
     @ApiOperation("订单确认收货接口")
     @PutMapping("/confirm/receipt")
     public R confirmReceipt(@Validated @RequestBody ProductOrderOperateDTO dto) {
-        this.productOrderInfoService.confirmReceipt(dto);
-        return R.ok();
+        boolean bool = this.productOrderInfoService.confirmReceipt(dto);
+        if(bool){
+            return R.ok();
+        }
+        return R.fail();
     }
 
     @ApiOperation("取消退货接口接口")
     @PutMapping("/cancel/return")
     public R cancelReturn(@Validated @RequestBody ProductOrderOperateDTO dto) {
-        this.productOrderInfoService.cancelReturn(dto);
-        return R.ok();
+        boolean bool = this.productOrderInfoService.cancelReturn(dto);
+        if(bool){
+            return R.ok();
+        }
+        return R.fail();
     }
 }

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

@@ -49,7 +49,7 @@ public interface IProductOrderInfoService extends IService<ProductOrderInfo> {
      */
     ProductOrderDetailVo getProductOrderDetail(String orderNo, String openId);
 
-    void confirmReceipt(ProductOrderOperateDTO dto);
+    boolean confirmReceipt(ProductOrderOperateDTO dto);
 
-    void cancelReturn(ProductOrderOperateDTO dto);
+    boolean cancelReturn(ProductOrderOperateDTO dto);
 }

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

@@ -351,7 +351,7 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void confirmReceipt(ProductOrderOperateDTO dto) {
+    public boolean confirmReceipt(ProductOrderOperateDTO dto) {
 
         // 1. 获取当前登录用户（公共方法提取）
         WxLoginUser loginUser = getCurrentWxLoginUser();
@@ -369,12 +369,12 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
         productOrderInfo.setOrderStatus(ProductOrderStatusEnum.RECEIVED.getCode());
         productOrderInfo.setReceiveTime(now);
         productOrderInfo.setUpdateTime(now);
-        this.updateById(productOrderInfo);
+        return this.updateById(productOrderInfo);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void cancelReturn(ProductOrderOperateDTO dto) {
+    public boolean cancelReturn(ProductOrderOperateDTO dto) {
 
         // 1. 获取当前登录用户（公共方法提取）
         WxLoginUser loginUser = getCurrentWxLoginUser();
@@ -390,7 +390,7 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
         LocalDateTime now = LocalDateTime.now();
         productOrderInfo.setOrderStatus(ProductOrderStatusEnum.WAIT_RECEIVE.getCode());
         productOrderInfo.setUpdateTime(now);
-        this.updateById(productOrderInfo);
+        return this.updateById(productOrderInfo);
     }
 
     private WxLoginUser getCurrentWxLoginUser() {