正常订单支付缺陷修复

src/main/java/com/mmc/oms/entity/uav/UavOrderPayDO.java

@@ -24,6 +24,7 @@ public class UavOrderPayDO implements Serializable {
     private static final long serialVersionUID = -7440333696084228732L;
     private Integer id;
     private Integer uavOrderId;
+    private String orderNo;
     private String payImgList;
     private Integer checkStatus;
     private Integer payType;

src/main/java/com/mmc/oms/model/dto/uav/UavOrderPayDTO.java

@@ -26,6 +26,8 @@ public class UavOrderPayDTO implements Serializable {
     private Integer id;
     @ApiModelProperty(value = "订单id")
     private Integer uavOrderId;
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
     @ApiModelProperty(value = "支付凭证")
     private String payImgList;
     @ApiModelProperty(value = "审核状态，0待审批，1通过，2未通过")

src/main/java/com/mmc/oms/mq/listener/MqConsumer.java

@@ -44,9 +44,9 @@ public class MqConsumer {
     @RabbitListener(queues = RabbitmqConstant.PAY_UAV_ORDER_SUCCESS_QUEUE)
     public void subscribePayUavOrderDirectQueue(@Payload String topUpOrder, Channel channel, Message message) {
         TopUpOrderVO topUpOrderVO = JSONObject.parseObject(topUpOrder, TopUpOrderVO.class);
-        log.info("<==========商城支付消费开始：信息是---->{}==========>", topUpOrderVO);
+        log.info("<==========商城支付消息消费开始：信息是---->{}==========>", topUpOrderVO);
         // 根据支付消息修改订单状态
         uavOrderService.payUavOrder(topUpOrderVO);
-        log.info("<==========用户充值订单消费结束==========>");
+        log.info("<==========商城支付消息消费结束==========>");
     }
 }

src/main/java/com/mmc/oms/service/uav/impl/UavOrderServiceImpl.java

@@ -491,7 +491,8 @@ public class UavOrderServiceImpl implements UavOrderService {
         if (uavOrderDO == null) {
             throw new RuntimeException();
         }
-        this.updateUavOrderStatus(uavOrderDO.getId(), UavOrderStatus.WAITING_DELIVER_GOODS);
+        // TODO 有问题
+        this.updateUavOrderStatus(uavOrderDO.getId(), UavOrderStatus.PAYING);
         // 修改订单信息
         uavOrderDO.setPayType("wechatpay");
         uavOrderDO.setPayTime(new Date());