Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java

@@ -90,6 +90,9 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
     @Autowired
     private KylinOrderTicketRelationsMapper kylinOrderTicketRelationsMapper;
 
+    @Autowired
+    private KylinOrderTicketStatusMapper kylinOrderTicketStatusMapper;
+
     @Autowired
     private DataUtils dataUtils;
 
@@ -136,6 +139,12 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
             KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
                     new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
             );
+            KylinOrderTicketStatus orderStatus = kylinOrderTicketStatusMapper.selectOne(
+                    new QueryWrapper<KylinOrderTicketStatus>().eq("order_id", orderTicketsId)
+            );
+            if (orderStatus.getStatus() != KylinTableStatusConst.ORDER_STATUS1 && orderStatus.getStatus() != KylinTableStatusConst.ORDER_STATUS6) {
+                return ResponseDto.failure("当前状态不能下单");
+            }
             // 生成预快递单 防止因失败没办法再次发起也不能主动获取数据
             KylinOrderExpress kylinOrderExpressPre = new KylinOrderExpress();
             String orderExpressId = IDGenerator.nextSnowId();