修改bug

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -298,7 +298,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
                //修改订单状态为已完成
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
-                baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 //修改订单详情是否押金全部退还
                 orderRentVehicleDetail.setFixedLossStatus(0);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);

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

@@ -43,6 +43,8 @@ public class RabbitConsumer {
         //通知 MQ 消息已被接收,可以ACK(从队列中删除)了
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
         try {
+            //设置自动取消标识
+            baseOrder.setCancelReason("超时未付款，系统自动取消订单");
             orderCancelBiz.cancel(baseOrder);
         }catch (BaseException e) {
             if(ResultCode.DB_OPERATION_FAIL_CODE == e.getStatus()) {