Merge branch 'refs/heads/v20.9_settlement_20240805' into test

performance-api/src/main/java/com/clx/performance/vo/pc/broker/OpenOrderChildDTO.java

@@ -73,4 +73,7 @@ public class OpenOrderChildDTO {
     @ApiModelProperty(value = "开票状态 0 未开票 1 已开票 ", example = "1")
     private Integer invoiceStatus;
 
+    @ApiModelProperty(value = "结算状态 1 已结算 ", example = "1234124", dataType = "String")
+    private Integer settleStatus;
+
 }

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

@@ -278,6 +278,7 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         orderChildInfo.setInvoicePlatform(settlementOwnerDetail.getInvoicingCompanyShorterName());
         orderChildInfo.setInvoiceStatus(Objects.equals(settlementOwnerDetail.getInvoiceStatus(),
                 SettlementOwnerDetailEnum.InvoiceStatus.YES.getCode())? 1 : 0);
+        orderChildInfo.setSettleStatus(Objects.equals(settlementOwnerDetail.getPayStatus(), SettlementOwnerDetailEnum.PayStatus.YES.getCode())? 1 : 0);
 
         transportParam.setOrder(orderInfo);
         transportParam.setOrderChildImage(imageList);

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

@@ -20,10 +20,7 @@ import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.payment.PayPlatformFeeParam;
 import com.clx.performance.service.PaymentService;
-import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
-import com.clx.performance.service.settle.OrderChildSyncTransportRecordService;
-import com.clx.performance.service.settle.SettlementDriverDetailService;
-import com.clx.performance.service.settle.SettlementDriverService;
+import com.clx.performance.service.settle.*;
 import com.clx.performance.struct.settle.SettlementDriverDetailStruct;
 import com.msl.common.result.Result;
 import lombok.AllArgsConstructor;
@@ -64,6 +61,8 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
     private final SettlementOwnerDetailDao settlementOwnerDetailDao;
     private final SettlementDriverDao settlementDriverDao;
 
+    private final SettlementPostService settlementPostService;
+
     @Override
     public void addOrderChildSyncTransportRecord(SettlementDriverDetail detail) {
         OrderChildSyncTransportRecord record = struct.convertRecord(detail);
@@ -130,5 +129,7 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
         }catch (Exception e){
             log.error("支付平台服务费异常 {}",e);
         }
+
+        settlementPostService.updatePaySuccess(settlementOwnerDetail);
     }
 }

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

@@ -363,6 +363,10 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         if (!Objects.equals(settlementOwnerDetail.getInvoiceChannel(), SettlementOwnerDetailEnum.InvoiceChannel.BROKER.getCode())){
             return;
         }
+        if (Objects.equals(settlementOwnerDetail.getInvoiceType(), SettlementOwnerEnum.InvoiceType.ORDINARY.getCode())){
+            // 普通单不同步状态
+            return;
+        }
 
         if (!Objects.equals(settlementOwnerDetail.getInvoiceStatus(), SettlementOwnerDetailEnum.InvoiceStatus.NO.getCode())){
             return;
@@ -427,6 +431,10 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         if (!Objects.equals(settlementOwnerDetail.getInvoiceChannel(), SettlementOwnerDetailEnum.InvoiceChannel.BROKER.getCode())){
             return;
         }
+        if (Objects.equals(settlementOwnerDetail.getInvoiceType(), SettlementOwnerEnum.InvoiceType.ORDINARY.getCode())){
+            // 普通单不同步状态
+            return;
+        }
 
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
                 .getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -914,6 +922,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
                 // 发送mq 结算统计
                 settlementMqService.settlementStatistics(childNo, SettlementStatisticsMqParam.Type.SEPARATE.getCode());
             }
+
+            // 发送mq (运单更新)
+            orderChildBrokerMqService.orderChildUpdate(childNo);
         }
         else if (Objects.equals(settlementOrderChildRisk.getProcessMethod(), SettlementOrderChildRiskEnum.ProcessMethod.SYNC_RETRY.getCode())){
 
@@ -1000,6 +1011,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         // 发送mq 结算统计
         settlementMqService.settlementStatistics(childNo);
 
+        // 发送mq (更新无车承运)
+        orderChildBrokerMqService.orderChildUpdate(settlementOwnerDetail.getChildNo());
+
     }
 
     @Transactional(rollbackFor = Exception.class)

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

@@ -2,14 +2,17 @@ package com.clx.performance.service.impl.settle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.settle.SettlementDriverDao;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.dao.settle.SettlementOrderChildRiskDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.ResultEnum;
+import com.clx.performance.enums.settle.SettlementDriverEnum;
 import com.clx.performance.enums.settle.SettlementOrderChildRiskEnum;
 import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
+import com.clx.performance.model.settle.SettlementDriver;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOrderChildRisk;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
@@ -48,6 +51,8 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
     @Autowired
     private SettlementOrderChildRiskDao settlementOrderChildRiskDao;
     @Autowired
+    private SettlementDriverDao settlementDriverDao;
+    @Autowired
     private SettlementOrderChildRiskStruct settlementOrderChildRiskStruct;
 
     @Autowired
@@ -68,6 +73,8 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
                 .getByChildNo(settlementOrderChildRisk.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
+        SettlementDriver settlementDriver = settlementDriverDao.findByChildNo(settlementOrderChildRisk.getChildNo()).orNull();
+
         settlementOrderChildRisk.setStatus(SettlementOrderChildRiskEnum.Status.PROCESSED.getCode());
         settlementOrderChildRisk.setProcessMethod(param.getProcessMethod());
         settlementOrderChildRisk.setProcessBy(loginUserInfo.getUserName());
@@ -90,6 +97,11 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
             settlementDriverDetailDao.updateConvertOrdinary(settlementDriverDetail);
 
             settlementOrderChildRisk.setInvoiceType(settlementOwnerDetail.getInvoiceType());
+
+            if (settlementDriver != null) {
+                // 删除结算单
+                settlementDriverDao.deleteByKey(settlementDriver.getId());
+            }
         }
         else {
 

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

@@ -551,7 +551,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(dto.getChildNo()));
             rowData.add(new ExcelData(dto.getOwnerUserNo()+""));
             rowData.add(new ExcelData(dto.getOwnerName()));
-            rowData.add(new ExcelData(SettlementWayEnum.WayType.getMsgByCode(dto.getSettlementWay())));
+            rowData.add(new ExcelData(dto.getSettlementWay()==null?null:SettlementWayEnum.WayType.getMsgByCode(dto.getSettlementWay())));
 
             rowData.add(new ExcelData(dto.getGoodsName()));
             rowData.add(new ExcelData(dto.getWeight()));
@@ -567,7 +567,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(dto.getSettlementFreight()==null?null:dto.getSettlementFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceFreight()==null?null:dto.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName()));
-            rowData.add(new ExcelData(SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
+            rowData.add(new ExcelData(dto.getInvoiceType()==null?null:SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
             rowData.add(new ExcelData(dto.getOrderNo()));
             rowData.add(new ExcelData(dto.getSettlementNo()));
             rowData.add(new ExcelData(dto.getCreateTime()));

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

@@ -572,8 +572,6 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         String settlementNo = param.getSettlementNo();
         settlementOwnerDao.uploadInvoiceImg(settlementNo,param.getInvoiceImg());
 
-        settlementOwnerDao.updateStatusBySettlementNo(settlementNo
-                ,SettlementOwnerEnum.Status.OWNER_TO_BE_CONFIRMED.getCode());
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         //保存结算单日志----上传结算凭证
         settlementLogService.saveSettlementLog(settlementNo,

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

 package com.clx.performance.service.impl.settle;
 
 import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.service.broker.OrderChildBrokerMqService;
 import com.clx.performance.service.settle.SettlementMqService;
 import com.clx.performance.service.settle.SettlementPostService;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +17,9 @@ public class SettlementPostServiceImpl implements SettlementPostService {
     @Autowired
     private SettlementMqService settlementMqService;
 
+    @Autowired
+    private OrderChildBrokerMqService orderChildBrokerMqService;
+
 
     @Override
     public void updateInvoiceCompany(List<SettlementOwnerDetail> list){
@@ -26,4 +30,10 @@ public class SettlementPostServiceImpl implements SettlementPostService {
         }
 
     }
+
+    @Override
+    public void updatePaySuccess(SettlementOwnerDetail settlementOwnerDetail) {
+        // 发送mq (更新无车承运)
+        orderChildBrokerMqService.orderChildUpdate(settlementOwnerDetail.getChildNo());
+    }
 }

performance-web/src/main/java/com/clx/performance/service/settle/SettlementPostService.java

@@ -7,4 +7,6 @@ import java.util.List;
 public interface SettlementPostService {
 
     void updateInvoiceCompany(List<SettlementOwnerDetail> list);
+
+    void updatePaySuccess(SettlementOwnerDetail settlementOwnerDetail);
 }