Merge branch 'v6.3_small_version_20231102' of https://t.clxkj.cn/clx-java/clx-performance into test

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -297,8 +297,10 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         orderChild.setSendAddressId(orderGoods.getSendAddressId());
         orderChild.setSendAddress(orderGoods.getSendAddressShorter());
+        orderChild.setSendSystemAddressId(orderGoods.getSendSystemAddressId());
         orderChild.setReceiveAddressId(orderGoods.getReceiveAddressId());
         orderChild.setReceiveAddress(orderGoods.getReceiveAddressShorter());
+        orderChild.setReceiveSystemAddressId(orderGoods.getReceiveSystemAddressId());
 
         orderChild.setLoadDeadline(orderGoods.getLastArriveSendTime());
 

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

@@ -146,6 +146,7 @@ public class OneGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             orderGoods.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CREATED.getCode());
             orderGoods.setSendAddressId(orderInfo.getSendAddressId());
             orderGoods.setSendAddressShorter(orderInfo.getSendAddressShorter());
+            orderGoods.setSendSystemAddressId(orderInfoFeign.getSendSystemAddressId());
             //收发货经纬度
             orderGoods.setSendLongitude(orderInfo.getSendLongitude());
             orderGoods.setSendLatitude(orderInfo.getSendLatitude());
@@ -153,6 +154,7 @@ public class OneGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             orderGoods.setReceiveLongitude(orderInfo.getReveiveLongitude());
             orderGoods.setReceiveAddressId(orderInfo.getReveiveAddressId());
             orderGoods.setReceiveAddressShorter(orderInfo.getReveiveAddressShorter());
+            orderGoods.setReceiveSystemAddressId(orderInfoFeign.getReveiveSystemAddressId());
 
             orderGoods.setGoodsName(orderInfo.getGoodsName());
             orderGoods.setGoodsId(orderInfo.getGoodsNameId());

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

@@ -147,6 +147,7 @@ public class ThreeGoodsOrderStrategy extends GoodsOrderStrategy implements Initi
             orderGoods.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CREATED.getCode());
             orderGoods.setSendAddressId(orderInfo.getSendAddressId());
             orderGoods.setSendAddressShorter(orderInfo.getSendAddressShorter());
+            orderGoods.setSendSystemAddressId(orderInfoFeign.getSendSystemAddressId());
             //收发货经纬度
             orderGoods.setSendLongitude(orderInfo.getSendLongitude());
             orderGoods.setSendLatitude(orderInfo.getSendLatitude());
@@ -154,6 +155,7 @@ public class ThreeGoodsOrderStrategy extends GoodsOrderStrategy implements Initi
             orderGoods.setReceiveLongitude(orderInfo.getReveiveLongitude());
             orderGoods.setReceiveAddressId(orderInfo.getReveiveAddressId());
             orderGoods.setReceiveAddressShorter(orderInfo.getReveiveAddressShorter());
+            orderGoods.setReceiveSystemAddressId(orderInfoFeign.getReveiveSystemAddressId());
             orderGoods.setGoodsName(orderInfo.getGoodsName());
             orderGoods.setGoodsId(orderInfo.getGoodsNameId());
 

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

@@ -150,6 +150,7 @@ public class TwoGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             orderGoods.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CREATED.getCode());
             orderGoods.setSendAddressId(orderInfo.getSendAddressId());
             orderGoods.setSendAddressShorter(orderInfo.getSendAddressShorter());
+            orderGoods.setSendSystemAddressId(orderInfoFeign.getSendSystemAddressId());
             //收发货经纬度
             orderGoods.setSendLongitude(orderInfo.getSendLongitude());
             orderGoods.setSendLatitude(orderInfo.getSendLatitude());
@@ -157,6 +158,7 @@ public class TwoGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             orderGoods.setReceiveLongitude(orderInfo.getReveiveLongitude());
             orderGoods.setReceiveAddressId(orderInfo.getReveiveAddressId());
             orderGoods.setReceiveAddressShorter(orderInfo.getReveiveAddressShorter());
+            orderGoods.setReceiveSystemAddressId(orderInfoFeign.getReveiveSystemAddressId());
             orderGoods.setGoodsName(orderInfo.getGoodsName());
             orderGoods.setGoodsId(orderInfo.getGoodsNameId());