兑换商品

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

@@ -27,6 +27,7 @@ import com.qs.mp.common.enums.TicketBoxStatusEnum;
 import com.qs.mp.common.enums.TicketStatusEnum;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.user.domain.param.ExchangeOrderParam;
+import com.qs.mp.user.service.IUserExchangeOrderService;
 import com.qs.mp.user.service.IUserHitPrizeService;
 import com.qs.mp.user.service.IUserTicketOrderItemService;
 import com.qs.mp.utils.SecurityUtils;
@@ -58,6 +59,9 @@ public class UserExchangeController extends BaseApiController {
   @Autowired
   private IGoodsSkuService goodsSkuService;
 
+  @Autowired
+  private IUserExchangeOrderService userExchangeOrderService;
+
 
   @Autowired
   private MapperFacade mapperFacade;
@@ -108,11 +112,12 @@ public class UserExchangeController extends BaseApiController {
   @PostMapping("/submit")
   @ApiOperation(value = "提交兑换订单" , notes = "提交兑换订单")
   public AjaxResult submit(@RequestBody ExchangeOrderParam param) {
-    if (StringUtils.isBlank(param.getGoodsId()) || null == param.getOrderNum()
+    Long userId = SecurityUtils.getUserId();
+    if (null == param.getGoodsId() || 0 == param.getGoodsId() || null == param.getOrderNum()
         || param.getOrderNum() == 0) {
       return AjaxResult.error("参数缺失");
     }
-
+    userExchangeOrderService.exchange(userId, param.getGoodsId(), param.getSkuId(), param.getOrderNum());
     return AjaxResult.success();
   }
 

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

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
  */
 @Component("channelOrderTask")
 public class ChannelOrderTask {
+
   protected final Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
 
   @Autowired
@@ -33,10 +34,11 @@ public class ChannelOrderTask {
     int total = PAGE_SIZE;
     while (total == PAGE_SIZE) {
       // 捞取30分钟前未支付订单
-      List<ChannelOrder> channelOrderList = channelOrderService.list(new LambdaQueryWrapper<ChannelOrder>().eq(ChannelOrder::getStatus,
-              ChannelOrderStatusEnum.NOT_PAY)
-          .lt(ChannelOrder::getCreatedTime, DateUtils.addMinutes(DateUtils.getNowDate(), -30))
-          .last("limit " + PAGE_SIZE));
+      List<ChannelOrder> channelOrderList = channelOrderService.list(
+          new LambdaQueryWrapper<ChannelOrder>()
+              .eq(ChannelOrder::getStatus, ChannelOrderStatusEnum.NOT_PAY)
+              .lt(ChannelOrder::getCreatedTime, DateUtils.addMinutes(DateUtils.getNowDate(), -30))
+              .last("limit " + PAGE_SIZE));
       total = channelOrderList.size();
       for (ChannelOrder channelOrder : channelOrderList) {
         try {

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

@@ -12,10 +12,10 @@ public class ExchangeOrderParam {
 
 	@NotEmpty(message = "商品ID不能为空")
 	@ApiModelProperty(value = "商品ID",required=true)
-	private String goodsId;
+	private Long goodsId;
 
 	@ApiModelProperty(value = "skuID",required=true)
-	private String skuId;
+	private Long skuId;
 
 	@NotEmpty(message = "兑换数量不能为空")
 	@ApiModelProperty(value = "兑换数量",required=false)