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

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/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/listener/OrderChildDtsListener.java

@@ -121,4 +121,7 @@ public class OrderChildDtsListener  {
         }
     }
 
+
+
+
 }

performance-web/src/main/java/com/clx/performance/service/LastTruckService.java

 package com.clx.performance.service;
 
 import com.clx.performance.model.OrderChild;
+import com.msl.common.result.Result;
 
 public interface LastTruckService {
 
     OrderChild getLastTruckChild(String orderNo);
 
-    void syncLastTruckChild(OrderChild child);
+    Result<?> syncLastTruckChild(OrderChild child);
 
 
     OrderChild getOrderCompleteLastTruck(String orderNo);
+
+    Result<?> syncLastTruckChild4OrderTrigger(String orderNo);
+
 }

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

@@ -67,13 +67,14 @@ public class LastTruckServiceImpl implements LastTruckService {
      * @return
      **/
     @Override
-    public void syncLastTruckChild(OrderChild child) {
+    public Result<?> syncLastTruckChild(OrderChild child) {
         OrderChildMessage message = orderChildStruct.convertMessage(child);
         message.setLastFlag(ResultStatusEnum.YES.getCode());
         log.info("开始同步最后一车的运单，运单编号:{},运单信息:{}",child.getChildNo(), JSON.toJSONString(message));
         OpenCallBackClient client2 = new OpenCallBackClient(mslAppConfig.getUrl(),mslAppConfig.getAppId(),mslAppConfig.getSecret());
         Result<?> result2 = client2.encryptPost(JSON.toJSONString(message),message.topic());
         log.info("结束同步最后一车的运单，运单编号:{}，响应结果:{}",child.getChildNo(),JSON.toJSONString(result2));
+        return result2;
     }
 
     @Override
@@ -87,4 +88,20 @@ public class LastTruckServiceImpl implements LastTruckService {
         }
         return null;
     }
+
+
+
+    /**
+     * @Author kavin
+     * @Description 订单取消、到达最晚拉运时间 同步最后一车
+     * @Param [orderNo]
+     * @return
+     **/
+    public Result<?> syncLastTruckChild4OrderTrigger(String orderNo) {
+        OrderChild child = getOrderCompleteLastTruck(orderNo);
+        if(Objects.nonNull(child)){
+            return syncLastTruckChild(child);
+        }
+        return Result.ok("订单完成/完结状态下未查询最后一车，订单编号:" + orderNo);
+    }
 }

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;