Merge branch 'master-background-manager'

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RabbitConsumer.java

@@ -3,7 +3,6 @@ package com.xxfc.platform.order.mqhandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.rabbitmq.client.Channel;
-import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.inner.OrderCancelBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import lombok.extern.slf4j.Slf4j;
@@ -45,7 +44,7 @@ public class RabbitConsumer {
         try {
             //设置自动取消标识
             baseOrder.setCancelReason("超时未付款，系统自动取消订单");
-            orderCancelBiz.cancel(baseOrder);
+            orderCancelBiz.cancel(baseOrder, null);
         }catch (BaseException e) {
             if(ResultCode.DB_OPERATION_FAIL_CODE == e.getStatus()) {
                 log.info("取消操作被取消;订单id："+ baseOrder.getId());