优化

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

@@ -49,17 +49,11 @@ public class ChannelOrderTask {
             .eq(ChannelOrder::getStatus, ChannelOrderStatusEnum.NOT_CONFIRM.getValue())
             .le(ChannelOrder::getDeliveryTime, deliveryTime));
 
-    List<ChannelOrder> params = new ArrayList<>();
     if (CollectionUtils.isNotEmpty(channelOrderList)) {
       for (ChannelOrder channelOrder : channelOrderList) {
-        ChannelOrder param = new ChannelOrder();
-        param.setOrderId(channelOrder.getOrderId());
-        param.setConfirmTime(new Date());
-        param.setStatus(ChannelOrderStatusEnum.FINISHED);
-        params.add(param);
+        channelOrderService.confirm(channelOrder);
       }
     }
-    channelOrderService.updateBatchById(params);
 
     LogUtil.info(logger, "...渠道商订单自动确认收货任务结束...");
   }

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelOrderServiceImpl.java

@@ -251,13 +251,13 @@ public class ChannelOrderServiceImpl extends
         param.setStatus(ChannelOrderStatusEnum.FINISHED);
         param.setConfirmTime(new Date());
         boolean rtn = channelOrderService.updateById(param);
-        Assert.isFalse(rtn,"更新提货订单状态失败,orderId:{0}", order.getOrderId());
+        Assert.isTrue(rtn,"更新提货订单状态失败,orderId:{0}", order.getOrderId());
 
         // 提交异步任务
         AsyncTask asyncTask = new AsyncTask();
         asyncTask.setType(AsyncTaskTypeEnum.CHANNEL_CONFIRM_RECEIPT.getValue());
         asyncTask.setBizId(order.getOrderId());
-        Assert.isFalse(asyncTaskService.save(asyncTask),"提交经销商提货订单确认收货任务失败,orderId:{0}", order.getOrderId());
+        Assert.isTrue(asyncTaskService.save(asyncTask),"提交经销商提货订单确认收货任务失败,orderId:{0}", order.getOrderId());
     }
 
     /**