Merge remote-tracking branch 'origin/v9.6_network_small_version_20240102' into test

performance-web/src/main/java/com/clx/performance/component/OwnerAccountComponent.java

+package com.clx.performance.component;
+
+
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.clx.order.feign.OrderFeign;
+import com.clx.performance.enums.OwnerAccountEnum;
+import com.clx.performance.param.pc.owner.ThawAccountParam;
+import com.clx.performance.param.pc.owner.UpdateStatusParam;
+import com.clx.performance.service.OwnerAccountService;
+import com.clx.performance.service.settle.SettlementOwnerDetailService;
+import com.clx.performance.service.settle.SettlementOwnerService;
+import com.msl.common.result.Result;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+@AllArgsConstructor
+public class OwnerAccountComponent {
+
+    private final SettlementOwnerDetailService settlementOwnerDetailService;
+
+    private final OwnerAccountService ownerAccountService;
+
+    private final SettlementOwnerService settlementOwnerService;
+
+    private final OrderFeign orderFeign;
+
+
+    public void thawOwnerAccountByOrderNo(String orderNo) {
+        Boolean flag = settlementOwnerDetailService.thawAndLockSettlement(orderNo);
+        if (flag) {
+            log.info("当前存在在途运单");
+            orderFeign.saveOrderSettlementJobRecord(orderNo);
+            return;
+        }
+        //TODO 注意判断普通单还是网运单 普通单类型 1  网运单 2
+        Integer invoiceType = settlementOwnerDetailService.getInvoiceType(orderNo);
+        //1 网运单 2 普通单
+        log.info("invoiceType={}", invoiceType);
+        ThawAccountParam thawAccountParam = new ThawAccountParam();
+        thawAccountParam.setOrderNo(orderNo);
+        if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(invoiceType)) {
+            log.info("执行普通单解冻");
+            thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
+            log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
+            ownerAccountService.ownerAccountThaw(thawAccountParam);
+        } else {
+            log.info("执行网运单解冻");
+            thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.NETWORK.getCode());
+            log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
+            ownerAccountService.ownerAccountThaw(thawAccountParam);
+        }
+
+        //通知结算单锁定
+        settlementOwnerService.updateStatusByOrderNo(orderNo, 1, 10, 20);
+    }
+}

performance-web/src/main/java/com/clx/performance/constant/RabbitKeyConstants.java

@@ -69,6 +69,9 @@ public class RabbitKeyConstants {
 
     public static final String ORDER_CHILD_SYNC_TRANSPORT_ROUTE_KEY ="clx-order.order.child.sync.transport.route.key";
 
+    public static final String ORDER_THAW_SETTLEMENT_LAZY_EXCHANGE ="clx-order.thaw.settlement.lazy.exchange";
+
+    public static final String ORDER_THAW_SETTLEMENT_LAZY_ROUTE_KEY ="clx-order.thaw.settlement.lazy.route.key";
 
     // 预付运费和保证金 自动冻结 触发消息队列
     public static final String FREEZE_TRIGGER_EXCHANGE = "clx-order.freeze.trigger.exchange";

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

@@ -2,7 +2,6 @@ package com.clx.performance.controller.feign;
 
 
 import com.clx.performance.param.pc.OrderCancelFeignParam;
-import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.service.OrderCancelService;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -26,14 +25,9 @@ public class OrderCancelFeignController {
 
     private final OrderCancelService orderCancelService;
 
-    @ApiOperation(value = "承运单发起订单取消货主端进行确认", notes = "<br>By:胡宇帆")
+    @ApiOperation(value = "承运端发起订单取消货主端进行确认", notes = "<br>By:胡宇帆")
     @PostMapping("/orderCancel")
     public Result<Object> orderCancel(@RequestBody OrderCancelFeignParam param) {
-//        OrderCancelParam cancelParam = new OrderCancelParam();
-//        cancelParam.setOrderNo(param.getOrderNo());
-//        cancelParam.setCancelType(3);
-//        cancelParam.setCreateByType(1);
-//        orderCancelService.platformCancelOrderPrePC(cancelParam);
         orderCancelService.ownerConfirmCancelOrderPre(param.getOrderNo());
         return Result.ok();
     }

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

@@ -34,12 +34,12 @@ public class OrderCancelController {
     private final OrderCancelService orderCancelService;
 
 
-    @ApiOperation(value = "承运端取消订单", notes = "<br>By:胡宇帆")
-    @PostMapping("/platformCancelOrderPre")
-    public Result<Object> platformCancelOrderPre(@RequestBody OrderCancelParam param) {
-        orderCancelService.platformCancelOrderPre(param);
-        return Result.ok();
-    }
+//    @ApiOperation(value = "承运端取消订单", notes = "<br>By:胡宇帆")
+//    @PostMapping("/platformCancelOrderPre")
+//    public Result<Object> platformCancelOrderPre(@RequestBody OrderCancelParam param) {
+//        orderCancelService.platformCancelOrderPre(param);
+//        return Result.ok();
+//    }
 
     @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/ownCancelOrderPre")

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

@@ -56,6 +56,9 @@ public class TransportSyncController {
 
     private final SettlementOwnerService settlementOwnerService;
 
+    private final OrderChildSyncTransportRecordService childSyncTransportRecordService;
+
+
     /**
      * 支付结果
      * @param param
@@ -107,7 +110,13 @@ public class TransportSyncController {
 
         return ThirdComponent.encrypt(JSON.toJSONString(Result.ok()));
     }
-
+    @ApiOperation(value = "addOrderChildSyncTransportRecord", notes = "<br>By:胡宇帆")
+    @GetMapping("/addOrderChildSyncTransportRecord")
+    public Result<Object> syncTest(@RequestParam("id") Integer id) {
+        SettlementDriverDetail driverDetail = settlementDriverDetailDao.getEntityByKey(id).get();
+        childSyncTransportRecordService.addOrderChildSyncTransportRecord(driverDetail);
+        return Result.ok();
+    }
 
     @ApiOperation(value = "syncTest", notes = "<br>By:胡宇帆")
     @GetMapping("/syncTest")

performance-web/src/main/java/com/clx/performance/dto/OrderCancelResult.java

+package com.clx.performance.dto;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class OrderCancelResult {
+
+    private Integer orderStatusCode;
+
+    private List<String> childNoList;
+}

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

@@ -28,10 +28,10 @@ public interface OrderCancelService {
      * 平台取消订单前置(只修改订单状态)
      * @param param
      */
-    void platformCancelOrderPre(OrderCancelParam param);
+//    void platformCancelOrderPre(OrderCancelParam param);
 
     /**
-     * 修改订单状态后执行规划吨数
+     * 修改订单状态后执行归还吨数
      * @param param
      */
     void orderCancelProcess(OrderCancelParam param);

performance-web/src/main/java/com/clx/performance/strategy/GoodsOrderStrategy.java

@@ -44,13 +44,13 @@ public abstract class GoodsOrderStrategy {
         if (Objects.equals(orderInfo.getStopFlag(), OrderStopEnum.Status.YES.getCode())) {
             throw new ServiceSystemException(ResultEnum.DATA_ERROR, "订单已暂停，无法进行提量");
         }
-//        String transportBeginTime = orderInfo.getTransportBeginTime();
-//        for (OrderGoodsChildParams param : orderGoodsParams.getOrderGoodsChildParams()) {
-//            String pendingOrderTime = param.getPendingOrderTime();
-//            if (DateUtils.parseDateTime(pendingOrderTime).get().isBefore(DateUtils.parseDateTime(transportBeginTime).get())) {
-//                throw new ServiceSystemException(ResultEnum.DATA_ERROR, "挂单时间不能早于拉运开始时间");
-//            }
-//        }
+        String transportBeginTime = orderInfo.getTransportBeginTime();
+        for (OrderGoodsChildParams param : orderGoodsParams.getOrderGoodsChildParams()) {
+            String pendingOrderTime = param.getPendingOrderTime();
+            if (DateUtils.parseDateTime(pendingOrderTime).get().isBefore(DateUtils.parseDateTime(transportBeginTime).get())) {
+                throw new ServiceSystemException(ResultEnum.DATA_ERROR, "挂单时间不能早于拉运开始时间");
+            }
+        }
         //多个定向单不允许车辆重复
         List<OrderGoodsChildParams> orderGoodsChildParams = orderGoodsParams.getOrderGoodsChildParams();
         Set<String> set = new HashSet<>();