Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into…

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

@@ -12,10 +12,7 @@ import com.clx.performance.component.OrderGoodsStatusLazyComponent;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
-import com.clx.performance.enums.OrderGoodsStatusEnum;
-import com.clx.performance.enums.OrderGoodsTypeEnum;
-import com.clx.performance.enums.PerformanceResultEnum;
-import com.clx.performance.enums.TruckDemandEnum;
+import com.clx.performance.enums.*;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.strategy.GoodsOrderStrategy;
@@ -24,6 +21,7 @@ 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.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -158,8 +156,8 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
 
             orderGoods.setCreateTime(now);
             orderGoods.setModifiedTime(now);
-            orderGoods.setUserName("loginUserInfo.getUserName()");
-            orderGoods.setUserNo(1L);
+            orderGoods.setUserName(loginUserInfo.getUserName());
+            orderGoods.setUserNo(loginUserInfo.getUserNo());
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId, child.getTruckList(), now);
             }