处理BUG,增加日志

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

@@ -6,6 +6,7 @@ import com.clx.order.param.feign.UpdateOrderInfoResidueWeightParam;
 import com.clx.order.params.OrderGoodsChildParams;
 import com.clx.order.params.OrderGoodsParams;
 import com.clx.order.vo.feign.FeignOrderVO;
+import com.clx.order.vo.feign.OrderOwnTruckVo;
 import com.clx.performance.component.GoodsOrderStrategyContext;
 import com.clx.performance.component.OrderGoodsIdGenerate;
 import com.clx.performance.component.OrderGoodsStatusLazyComponent;
@@ -32,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 自由车辆
@@ -65,6 +67,7 @@ public class ThreeGoodsOrderStrategy implements GoodsOrderStrategy, Initializing
     @Autowired
     private OrderGoodsStatusLazyComponent orderGoodsStatusLazyComponent;
 
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public LocalDateTime goodsOrderProcess(OrderGoodsParams orderGoodsParams, FeignOrderVO orderInfo, LocalDateTime now) {
@@ -148,8 +151,13 @@ public class ThreeGoodsOrderStrategy implements GoodsOrderStrategy, Initializing
             orderGoods.setModifiedTime(now);
             orderGoods.setUserName(loginUserInfo.getUserName());
             orderGoods.setUserNo(loginUserInfo.getUserNo());
-            if (CollectionUtil.isNotEmpty(child.getTruckList())) {
-                orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderNoPrefix + beginOrderGoodsId, child.getTruckList(), now);
+            List<OrderOwnTruckVo> orderOwnTruckVos = orderFeign.selectTruckListFeign(orderNo);
+            if (orderOwnTruckVos == null || orderOwnTruckVos.isEmpty()) {
+                throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "全部自由车辆列表数据为空");
+            }
+            List<String> collect = orderOwnTruckVos.stream().map(OrderOwnTruckVo::getTruckNo).collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(collect)) {
+                orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderNoPrefix + beginOrderGoodsId, collect, now);
             }
             mqMap.put(orderNoPrefix + beginOrderGoodsId, postedTime);
             orderGoodsStatusLazyComponent.expireProduce(orderGoods.getLastArriveSendTime(), orderNoPrefix + beginOrderGoodsId);

performance-web/src/test/java/com/clx/performance/JobTest.java

 package com.clx.performance;
 
+import com.clx.order.enums.OrderEnum;
 import com.clx.order.feign.OrderFeign;
+import com.clx.order.param.feign.UpdateOrderInfoParam;
 import com.clx.order.param.feign.UpdateOrderInfoResidueWeightParam;
+import com.clx.order.vo.feign.FeignOrderVO;
+import com.clx.order.vo.feign.OrderOwnTruckVo;
 import com.clx.performance.component.OrderGoodsStatusLazyComponent;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.enums.OrderGoodsStatusEnum;
+import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
+import com.msl.common.base.Optional;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.amqp.core.Message;
@@ -21,8 +28,11 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.Date;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @SpringBootTest
 @RunWith(SpringRunner.class)
@@ -44,22 +54,8 @@ public class JobTest {
     private OrderGoodsDao orderGoodsDao;
     @Test
     public void test1() {
-        List<OrderGoods> list = orderGoodsDao.getOrderGoodsListByOrderNoAndLastArriveSendTime("PT2023092700023", LocalDateTime.now());
-        BigDecimal childSum = list.stream().map(OrderGoods::getExtractWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
-        System.out.println();
-
-
-//                UpdateOrderInfoResidueWeightParam param = new UpdateOrderInfoResidueWeightParam();
-//        param.setOrderId(150);
-//        param.setUpdateType("1");
-//        param.setResidueWeight(new BigDecimal(200));
-//        orderFeign.updateOrderInfoResidueWeight(param);
-
-
-//        Message message = MessageBuilder.withBody("PT2023091900049".getBytes()).build();
-//        message.getMessageProperties().setExpiration("10000");
-//        rabbitTemplate.send(
-//                RabbitKeyConstants.ORDER_GOODS_ON_EXCHANGE, RabbitKeyConstants.ORDER_GOODS_ON_ROUTE_KEY, message
-//        );
+        List<OrderOwnTruckVo> orderOwnTruckVos = orderFeign.selectTruckListFeign("PT2023092700041");
+        List<String> collect = orderOwnTruckVos.stream().map(OrderOwnTruckVo::getTruckNo).collect(Collectors.toList());
+        System.out.println(collect);
     }
 }