优化

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -298,7 +298,7 @@ public class UserDeliverOrderController extends BaseApiController {
   @PostMapping("/order/cancel")
   @ApiOperation(value = "取消订单" , notes = "在订单列表页面取消")
   public AjaxResult cancel(@RequestBody UserDeliverOrderCancelParam param) {
-    userDeliverOrderService.cancelOrder(param);
+    userDeliverOrderService.cancelOrder(param.getOrderId());
     return AjaxResult.success("取消成功");
   }
 

mp-quartz/src/main/java/com/qs/mp/quartz/task/UserDeliverOrderTask.java

@@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.qs.mp.channel.domain.ChannelOrder;
 import com.qs.mp.common.enums.ChannelOrderStatusEnum;
+import com.qs.mp.common.enums.DeliverOrderResourceEnum;
 import com.qs.mp.common.enums.DeliverOrderStatusEnum;
 import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.user.domain.UserDeliverOrder;
+import com.qs.mp.user.domain.param.UserDeliverOrderCancelParam;
 import com.qs.mp.user.service.IUserDeliverOrderService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

mp-service/src/main/java/com/qs/mp/user/domain/param/UserDeliverOrderCancelParam.java

@@ -19,7 +19,4 @@ public class UserDeliverOrderCancelParam {
     @NotBlank(message = "订单号不能为空")
     @ApiModelProperty("订单号")
     private String orderId;
-
-    @ApiModelProperty("订单来源:1提货订单,2现金购买")
-    private DeliverOrderResourceEnum resource;
 }

mp-service/src/main/java/com/qs/mp/user/service/IUserDeliverOrderService.java

@@ -38,18 +38,10 @@ public interface IUserDeliverOrderService extends IService<UserDeliverOrder> {
 	/**
 	 * 取消订单
 	 *
-	 * @param param
+	 * @param OrderId
 	 * @return
 	 */
-	boolean cancelOrder(UserDeliverOrderCancelParam param);
-
-	/**
-	 * 取消订单
-	 *
-	 * @param orderId
-	 * @return
-	 */
-	boolean cancelOrder(String orderId);
+	boolean cancelOrder(String OrderId);
 
 	/**
 	 * 支付成功回调

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -119,25 +119,17 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
     return userDeliverOrder.getOrderId();
   }
 
-    @Override
-    public boolean cancelOrder(String orderId) {
-        UserDeliverOrderCancelParam userDeliverOrderCancelParam = new UserDeliverOrderCancelParam();
-        userDeliverOrderCancelParam.setOrderId(orderId);
-        userDeliverOrderCancelParam.setResource(DeliverOrderResourceEnum.DELIVER);
-        return this.cancelOrder(userDeliverOrderCancelParam);
-    }
 
     @Override
   @Transactional(rollbackFor = Exception.class)
-  public boolean cancelOrder(UserDeliverOrderCancelParam param) {
-      String orderId = param.getOrderId();
+  public boolean cancelOrder(String orderId) {
     UserDeliverOrder userDeliverOrder = getById(orderId);
     if (userDeliverOrder.getStatus() != DeliverOrderStatusEnum.NOT_PAY) {
       LogUtil.warn(logger, "取消提货订单时，订单状态不是待支付，忽略。orderId:{0}, status:{1}",
           orderId, userDeliverOrder.getStatus());
       return false;
     }
-    if (!DeliverOrderResourceEnum.PAYMENT.equals(param.getResource())) {
+    if (!DeliverOrderResourceEnum.PAYMENT.equals(userDeliverOrder.getResource())) {
         // 恢复奖品库状态
         List<UserDeliverOrderItem> orderItemList = userDeliverOrderItemService.list(new LambdaQueryWrapper<UserDeliverOrderItem>()
                 .eq(UserDeliverOrderItem::getOrderId, userDeliverOrder.getOrderId()));