Merge remote-tracking branch 'origin/applet/2022-02-11-暴露创建订单业务相关接口' into develop

order-application-service/src/main/java/cn/freemud/controller/ExposureOrderController.java

@@ -6,6 +6,7 @@ import cn.freemud.enums.OrderTackCodeFactory;
 import cn.freemud.manager.OrderTackCodeManager;
 import cn.freemud.service.business.OrderBusinessService;
 import cn.freemud.service.business.impl.OrderBusinessServiceImpl;
+import cn.freemud.service.impl.OrderQueueService;
 import cn.freemud.service.impl.OrderServiceImpl;
 import cn.freemud.service.impl.PayServiceImpl;
 import cn.freemud.utils.ResponseUtil;
@@ -33,6 +34,9 @@ public class ExposureOrderController {
     @Autowired
     private OrderServiceImpl orderService;
 
+    @Autowired
+    private OrderQueueService orderQueueService;
+
     /**
      * 创建支付单,查询支付配置
      */
@@ -130,4 +134,14 @@ public class ExposureOrderController {
         return ResponseUtil.success();
     }
 
+    /**
+     * 回滚订单状态改动
+     */
+    @ApiAnnotation(logMessage = "回滚订单状态改动")
+    @PostMapping("/backOrdersStatusChange")
+    public BaseResponse backOrdersStatusChange(@Validated @LogParams @RequestBody BackOrdersStatusChangeVo backOrdersStatusChangeVo) {
+        orderQueueService.backOrdersStatusChange(backOrdersStatusChangeVo.getOrderCode(), backOrdersStatusChangeVo.getOrderState());
+        return ResponseUtil.success();
+    }
+
 }

order-application-service/src/main/java/cn/freemud/entities/vo/BackOrdersStatusChangeVo.java

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+
+@Data
+public class BackOrdersStatusChangeVo {
+
+    private String orderCode;
+
+    private Integer orderState;
+
+
+}

order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java

@@ -1511,7 +1511,6 @@ public class PayServiceImpl {
     }
 
     public void putRoundRobin(PutRoundRobinVo putRoundRobinVo) {
-        redisCache.save(RedisUtil.getPaymentTransIdOrderKey(putRoundRobinVo.getEbCode()), putRoundRobinVo.getOrderCode(), 1L, TimeUnit.DAYS);
         //加入轮训队列
         this.putDelMq(putRoundRobinVo.getPartnerId(),
                 putRoundRobinVo.getStoreId(),