修改BUG

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -77,7 +77,6 @@ public class GoodsOrderController {
         String orderNo = orderGoodsParams.getOrderNo();
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime sendLazyTime = null;
-        //UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         RLock rLock = null;
         try {
             //1. 加分布式锁通过订单ID

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

@@ -17,6 +17,8 @@ import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.strategy.GoodsOrderStrategy;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.utils.DateUtils;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +52,7 @@ public class OneGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
     @Override
     public LocalDateTime goodsOrderProcess(OrderGoodsParams orderGoodsParams, FeignOrderVO orderInfo) {
         String orderNo = orderGoodsParams.getOrderNo();
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
 
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime sendLazyTime = null;
@@ -113,11 +116,13 @@ public class OneGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
             orderGoods.setReceiveLatitude(orderInfo.getReveiveLatitude());
             orderGoods.setReceiveLongitude(orderInfo.getReveiveLongitude());
             orderGoods.setReceiveAddressId(orderInfo.getReveiveAddressId());
+            orderGoods.setReceiveAddressShorter(orderInfo.getReveiveAddressShorter());
+
             orderGoods.setGoodsName(orderInfo.getGoodsName());
             orderGoods.setCreateTime(now);
             orderGoods.setModifiedTime(now);
-            orderGoods.setUserName("loginUserInfo.getUserName()");
-            orderGoods.setUserNo(123L);
+            orderGoods.setUserName(loginUserInfo.getUserName());
+            orderGoods.setUserNo(loginUserInfo.getUserNo());
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId, child.getTruckList(), now);
             }

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

@@ -17,6 +17,8 @@ import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.strategy.GoodsOrderStrategy;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.utils.DateUtils;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +54,7 @@ public class ThreeGoodsOrderStrategy implements GoodsOrderStrategy, Initializing
     @Override
     public LocalDateTime goodsOrderProcess(OrderGoodsParams orderGoodsParams, FeignOrderVO orderInfo) {
         String orderNo = orderGoodsParams.getOrderNo();
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
 
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime sendLazyTime = null;
@@ -113,8 +116,8 @@ public class ThreeGoodsOrderStrategy implements GoodsOrderStrategy, Initializing
             orderGoods.setGoodsName(orderInfo.getGoodsName());
             orderGoods.setCreateTime(now);
             orderGoods.setModifiedTime(now);
-            orderGoods.setUserName("loginUserInfo.getUserName()");
-            orderGoods.setUserNo(123L);
+            orderGoods.setUserName(loginUserInfo.getUserName());
+            orderGoods.setUserNo(loginUserInfo.getUserNo());
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId, child.getTruckList(), now);
             }

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

@@ -17,6 +17,8 @@ import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.strategy.GoodsOrderStrategy;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.utils.DateUtils;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +55,7 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
     @Override
     public LocalDateTime goodsOrderProcess(OrderGoodsParams orderGoodsParams, FeignOrderVO orderInfo) {
         String orderNo = orderGoodsParams.getOrderNo();
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
 
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime sendLazyTime = null;
@@ -119,8 +122,8 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
             orderGoods.setGoodsName(orderInfo.getGoodsName());
             orderGoods.setCreateTime(now);
             orderGoods.setModifiedTime(now);
-            orderGoods.setUserName("loginUserInfo.getUserName()");
-            orderGoods.setUserNo(123L);
+            orderGoods.setUserName(loginUserInfo.getUserName());
+            orderGoods.setUserNo(loginUserInfo.getUserNo());
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId, child.getTruckList(), now);
             }