Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

@@ -129,7 +129,7 @@ public class OrderChildSqlProvider {
     public String batchUpdateOrderChildStatus(@Param(value ="status") Integer status, @Param(value = "ids") List<Integer> ids ){
         StringBuffer sqlList = new StringBuffer();
 
-        sqlList.append("update order_child set status = " + status + "where id in (");
+        sqlList.append("update order_child set status = " + status + " where id in (");
         for (int i = 0; i < ids.size(); i++) {
             Integer id = ids.get(i);
 

performance-web/src/main/java/com/clx/performance/strategy/impl/OneGoodsOrderStrategy.java

 package com.clx.performance.strategy.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.clx.order.enums.OrderEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.param.feign.UpdateOrderInfoResidueWeightParam;
 import com.clx.performance.param.pc.OrderGoodsChildParams;
@@ -66,6 +67,13 @@ public class OneGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
     @Transactional(rollbackFor = Exception.class)
     public LocalDateTime goodsOrderProcess(OrderGoodsParams orderGoodsParams, FeignOrderVO orderInfo, LocalDateTime now) {
         String orderNo = orderGoodsParams.getOrderNo();
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
+        if (!OrderEnum.Status.ON_ORDER.getCode().equals(orderInfoFeign.getOrderStatus())||
+                !OrderEnum.Status.IN_TRANSIT.getCode().equals(orderInfoFeign.getOrderStatus())
+        ) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前订单状态已发生变化,不可被提取");
+        }
+
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
 
         LocalDateTime sendLazyTime = null;

performance-web/src/main/java/com/clx/performance/strategy/impl/ThreeGoodsOrderStrategy.java

 package com.clx.performance.strategy.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.clx.order.enums.OrderEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.param.feign.UpdateOrderInfoResidueWeightParam;
 import com.clx.performance.param.pc.OrderGoodsChildParams;
@@ -69,6 +70,13 @@ public class ThreeGoodsOrderStrategy extends GoodsOrderStrategy implements Initi
     @Transactional(rollbackFor = Exception.class)
     public LocalDateTime goodsOrderProcess(OrderGoodsParams orderGoodsParams, FeignOrderVO orderInfo, LocalDateTime now) {
         String orderNo = orderGoodsParams.getOrderNo();
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
+        if (!OrderEnum.Status.ON_ORDER.getCode().equals(orderInfoFeign.getOrderStatus())||
+                !OrderEnum.Status.IN_TRANSIT.getCode().equals(orderInfoFeign.getOrderStatus())
+        ) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前订单状态已发生变化,不可被提取");
+        }
+
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
 
         LocalDateTime sendLazyTime = null;

performance-web/src/main/java/com/clx/performance/strategy/impl/TwoGoodsOrderStrategy.java

 package com.clx.performance.strategy.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.clx.order.enums.OrderEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.param.feign.UpdateOrderInfoResidueWeightParam;
 import com.clx.performance.param.pc.OrderGoodsChildParams;
@@ -64,6 +65,12 @@ public class TwoGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
     @Transactional(rollbackFor = Exception.class)
     public LocalDateTime goodsOrderProcess(OrderGoodsParams orderGoodsParams, FeignOrderVO orderInfo, LocalDateTime now) {
         String orderNo = orderGoodsParams.getOrderNo();
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
+        if (!OrderEnum.Status.ON_ORDER.getCode().equals(orderInfoFeign.getOrderStatus())||
+                !OrderEnum.Status.IN_TRANSIT.getCode().equals(orderInfoFeign.getOrderStatus())
+        ) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前订单状态已发生变化,不可被提取");
+        }
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
 
         LocalDateTime sendLazyTime = null;