Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into test

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -97,6 +97,9 @@ public enum PerformanceResultEnum implements ResultEnum {
     APP_POP_UP_ERROR(-1000, "app弹窗提示"),
     WALLET_CODE_IS_NULL(1704, "用户钱包不存在"),
 
+    ORDER_GOODS_SAVE_FAIL(1801, "保存货单失败,请稍后再试"),
+
+
     ;
     private final int code;
     private final String msg;

performance-web/src/main/java/com/clx/performance/controller/feign/OrderChildFeignController.java

@@ -13,6 +13,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -60,4 +61,12 @@ public class OrderChildFeignController {
         return Result.ok(feignOrderChildService.getLineStatistics(sendSystemAddressId, receiveSystemAddressId));
 
     }
+
+    @ApiOperation(value = "订单取消/到达最晚拉运时间同步最后一车", notes = "<br>By:刘海泉")
+    @RequestMapping(value = "/syncLastTruck", method = RequestMethod.GET)
+    Result<?> syncLastTruck(@RequestParam("orderNo") @NotBlank(message = "订单编号不能为空") String orderNo){
+        return lastTruckService.syncLastTruckChild4OrderTrigger(orderNo);
+
+    }
+
 }

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

@@ -87,7 +87,7 @@ public class GoodsOrderController {
             //获取锁
             rLock = redissonClient.getLock(RedisConstants.ORDER_NO_BLOCK + orderNo);
             //设置超时
-            rLock.lock(1, TimeUnit.MINUTES);
+            rLock.lock(5, TimeUnit.SECONDS);
             //2. 通过OrderNo 查询订单信息
             FeignOrderVO orderInfo = orderFeign.getOrderInfoFeign(orderNo);
             //1平台车辆 2部分平台车辆 3自有车辆
@@ -96,7 +96,7 @@ public class GoodsOrderController {
 
         } catch (Exception e) {
             log.info(e.getMessage());
-            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, e.getMessage());
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_SAVE_FAIL, e.getMessage());
         } finally {
             try {
                 if (rLock != null && rLock.isLocked() && rLock.isHeldByCurrentThread()) {

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

@@ -724,7 +724,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         }
         List<OrderGoodsTruckBind> truckBindList = orderGoodsTruckBindDao.selectListByOrderGoodsNo(orderGoodsVO.getOrderGoodsNo());
         if (CollectionUtils.isNotEmpty(truckBindList)) {
-            orderGoodsVO.setTruckList(truckBindList.stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList()));
+            List<String> collect = truckBindList.stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList());
+            orderGoodsVO.setTruckList(collect.stream().distinct().collect(Collectors.toList()));
         }
         result.setOrderGoodsVO(orderGoodsVO);
 

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

@@ -43,10 +43,10 @@ import java.util.stream.Collectors;
 /**
  * 自由车辆
  */
-@Component("ThreeGoodsOrderStrategy")
+@Component("OwnGoodsOrderStrategy")
 @Slf4j
 @AllArgsConstructor
-public class ThreeGoodsOrderStrategy extends GoodsOrderStrategy implements InitializingBean {
+public class OwnGoodsOrderStrategy extends GoodsOrderStrategy implements InitializingBean {
 
     private final OrderGoodsIdGenerate orderGoodsIdGenerate;
 

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

@@ -38,10 +38,10 @@ import java.util.Map;
 /**
  * 部分平台
  */
-@Component("TwoGoodsOrderStrategy")
+@Component("PartGoodsOrderStrategy")
 @Slf4j
 @AllArgsConstructor
-public class TwoGoodsOrderStrategy extends GoodsOrderStrategy implements InitializingBean {
+public class PartGoodsOrderStrategy extends GoodsOrderStrategy implements InitializingBean {
 
     private final OrderGoodsIdGenerate orderGoodsIdGenerate;
 

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

@@ -38,10 +38,10 @@ import java.util.Map;
 /**
  * 全部平台
  */
-@Component("OneGoodsOrderStrategy")
+@Component("PlatformGoodsOrderStrategy")
 @Slf4j
 @AllArgsConstructor
-public class OneGoodsOrderStrategy extends GoodsOrderStrategy implements InitializingBean {
+public class PlatformGoodsOrderStrategy extends GoodsOrderStrategy implements InitializingBean {
 
 
     private final OrderGoodsIdGenerate orderGoodsIdGenerate;