Merge remote-tracking branch 'origin/v20.9_settlement_20240805' into v20.9_settlement_20240805

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDetailDaoImpl.java

@@ -176,7 +176,7 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
     @Override
     public List<SettlementOwnerDetail> getListByChildNoList(List<String> childNoList) {
         return list(lQrWrapper()
-                .eq(SettlementOwnerDetail::getChildNo, childNoList));
+                .in(SettlementOwnerDetail::getChildNo, childNoList));
     }
 
     @Override

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

@@ -25,7 +25,6 @@ import com.clx.performance.struct.settle.SettlementDriverDetailStruct;
 import com.msl.common.result.Result;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -130,6 +129,6 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
             log.error("支付平台服务费异常 {}",e);
         }
 
-        settlementPostService.updatePaySuccess(settlementOwnerDetail);
+        settlementPostService.updateDriverPaySuccess(orderChild.getChildNo());
     }
 }

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

@@ -158,6 +158,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Autowired
     private NetworkDriverRunningWaterRecordService networkDriverRunningWaterRecordService;
 
+    @Autowired
+    private SettlementPostService settlementPostService;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -661,6 +664,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             // 日志
             orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.COMPLETE.getCode(),
                     OrderChildLogEnum.Type.COMPLETE.getMsg(), 0L, "系统");
+
+            settlementPostService.updateDriverPaySuccess(childNo);
         }else{
             settlementDriverDao.updatePayErrorMsg(settlementDriver.getId(),payErrorMsg);
         }

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

@@ -44,13 +44,15 @@ public class SettlementOwnerExportServiceImpl implements SettlementOwnerExportSe
 
         fieldList.add(new ExcelField(10, "预付运费金额", "prepayFreight", 5000));
         fieldList.add(new ExcelField(11, "货损吨数", "lossWeight", 5000));
-        fieldList.add(new ExcelField(12, "管理费", "invoiceServiceFee", 5000));
-        fieldList.add(new ExcelField(13, "借款抵扣金额", "loanFreight", 5000));
-        fieldList.add(new ExcelField(14, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(12, "货损金额", "lossFreight", 5000));
+        fieldList.add(new ExcelField(13, "管理费", "invoiceServiceFee", 5000));
+        fieldList.add(new ExcelField(14, "借款抵扣金额", "loanFreight", 5000));
 
-        fieldList.add(new ExcelField(15, "开票金额", "invoiceFreight", 5000));
-        fieldList.add(new ExcelField(16, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(17, "状态", "status", 5000));
+        fieldList.add(new ExcelField(15, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(16, "开票金额", "invoiceFreight", 5000));
+        fieldList.add(new ExcelField(17, "开票公司", "invoicingCompanyShorterName", 5000));
+        fieldList.add(new ExcelField(18, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(19, "状态", "status", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -73,11 +75,13 @@ public class SettlementOwnerExportServiceImpl implements SettlementOwnerExportSe
 
             rowData.add(new ExcelData(dto.getPrepayFreight().movePointLeft(2).setScale(2, RoundingMode.HALF_UP)));
             rowData.add(new ExcelData(dto.getLossWeight()));
+            rowData.add(new ExcelData(dto.getLossFreight().movePointLeft(2).setScale(2, RoundingMode.HALF_UP)));
             rowData.add(new ExcelData(dto.getInvoiceServiceFee().movePointLeft(2).setScale(2, RoundingMode.HALF_UP)));
             rowData.add(new ExcelData(dto.getLoanFreight().movePointLeft(2).setScale(2, RoundingMode.HALF_UP)));
-            rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2).setScale(2, RoundingMode.HALF_UP)));
 
+            rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2).setScale(2, RoundingMode.HALF_UP)));
             rowData.add(new ExcelData(dto.getInvoiceFreight().movePointLeft(2).setScale(2, RoundingMode.HALF_UP)));
+            rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName()));
             rowData.add(new ExcelData(dto.getCreateTime()));
             rowData.add(new ExcelData(dto.getStatusMsg()));
 

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

@@ -761,7 +761,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         Integer invoicingCompanyId = null;
         //开票公司上报标识
         Integer reportFlag  = null ;
-        String tip = "结算单状态“待对账”且同一货主，同一开票标识，同一结算方式，同一开票公司，同一上报标识 支持合并";
+        String tip = "结算单状态“待对账或待货主确认”且同一货主，同一开票标识，同一结算方式，同一开票公司，同一上报标识 支持合并";
         SettlementOwner merge = null;
         String settlementNo = settlementMqHandlerService.settlementNoGenerate();
 

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

@@ -39,9 +39,9 @@ public class SettlementPostServiceImpl implements SettlementPostService {
     }
 
     @Override
-    public void updatePaySuccess(SettlementOwnerDetail settlementOwnerDetail) {
+    public void updateDriverPaySuccess(String childNo) {
         // 发送mq (更新无车承运)
-        orderChildBrokerMqService.orderChildUpdate(settlementOwnerDetail.getChildNo());
+        orderChildBrokerMqService.orderChildUpdate(childNo);
     }
 
     @Override

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

@@ -9,7 +9,7 @@ public interface SettlementPostService {
 
     void updateInvoiceCompany(List<SettlementOwnerDetail> list);
 
-    void updatePaySuccess(SettlementOwnerDetail settlementOwnerDetail);
+    void updateDriverPaySuccess(String childNo);
 
     void updatePayConfirm(SettlementOwner settlementOwner);