Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

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

@@ -11,12 +11,14 @@ import com.clx.order.vo.feign.FeignOrderInfoVO;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.extranal.user.OrderService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.pc.OrderCancelParam;
+import com.clx.performance.param.pc.owner.ThawAccountParam;
 import com.clx.performance.service.IntegralMqService;
 import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.OrderGoodsService;
@@ -80,6 +82,8 @@ public class OrderCancelComponent implements InitializingBean {
     @Autowired
     private OrderGoodsService orderGoodsService;
 
+    private final SettlementOwnerDetailDao settlementOwnerDetailDao;
+
     public List<String> ownerProcess(OrderCancelParam param) {
         String orderNo = param.getOrderNo();
         List<OrderGoods> orderGoodsList = null;
@@ -108,6 +112,17 @@ public class OrderCancelComponent implements InitializingBean {
                     orderGoodsDao.batchUpdateOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode(),
                             ids);
                 }
+                //1网运单 2普通单
+                Integer invoiceType = settlementOwnerDetailDao.getInvoiceType(orderNo);
+                log.info("invoiceType={}", invoiceType);
+                ThawAccountParam thawAccountParam = new ThawAccountParam();
+
+                if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(invoiceType)) {
+                    thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
+                } else {
+                    thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.NETWORK.getCode());
+                }
+                thawAccountParam.setOrderNo(orderNo);
                 break;
             case 2: //取消未拉运吨数的货单
                 log.info("2:货主取消未拉运吨数的货单");

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

@@ -91,7 +91,20 @@ public class OrderCancelServiceImpl implements OrderCancelService {
             if (!result.succeed()) {
                 throw new RuntimeException("货主取消订单失败,原因：远程调用取消订单失败");
             }
-            //TODO 注意判断普通单还是网运单 普通单类型 2  网运单 1
+            //TODO 注意判断普通单还是网运单 普通单类型 1  网运单 2
+            //1网运单 2普通单
+            Integer invoiceType = settlementOwnerDetailDao.getInvoiceType(orderNo);
+            log.info("invoiceType={}", invoiceType);
+            ThawAccountParam thawAccountParam = new ThawAccountParam();
+
+            if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(invoiceType)) {
+                thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
+            } else {
+                thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.NETWORK.getCode());
+            }
+            thawAccountParam.setOrderNo(orderNo);
+            log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
+            ownerAccountService.ownerAccountThaw(thawAccountParam);
             this.ownerConfirmCancelProcess(orderNo);
             return;
         }