承运结算单优化-增加装车卸车吨数

performance-web/src/main/java/com/clx/performance/job/OrderChildPaySyncTransportJob.java

@@ -11,6 +11,7 @@ import com.clx.performance.feign.TransportFeignService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.settle.OrderChildSyncTransportRecord;
+import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.param.feign.transport.OrderChildPaySyncParam;
 import com.clx.performance.service.settle.SettlementDriverDetailService;
 import com.clx.performance.service.settle.SettlementMqHandlerService;
@@ -96,10 +97,10 @@ public class OrderChildPaySyncTransportJob {
         log.info("XxlJobHelper jobParam:{}", jobParam);
         OrderChild orderChild = orderChildDao.getByChildNo(jobParam).get();
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
-        Integer settlementDriverDetailId = settlementDriverDetailService.saveSettlementDetail(orderChild);
-        Integer settlementOwnerDetailId = settlementOwnerDetailService.saveSettlementDetail(orderChild, orderGoods);
+        SettlementDriverDetail settlementDriverDetail = settlementDriverDetailService.saveSettlementDetail(orderChild);
+        Integer settlementOwnerDetailId = settlementOwnerDetailService.saveSettlementDetail(orderChild, orderGoods, settlementDriverDetail);
 
-        settlementMqService.settlementDetailAdd(settlementDriverDetailId, settlementOwnerDetailId);
+        settlementMqService.settlementDetailAdd(settlementDriverDetail.getId(), settlementOwnerDetailId);
 
     }
 

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

@@ -5,6 +5,7 @@ import com.clx.performance.enums.*;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderChildPoundAudit;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.param.mq.IntegralOrderChildFinishMqParam;
 import com.clx.performance.service.IntegralMqService;
 import com.clx.performance.service.OrderChildMqService;
@@ -198,10 +199,10 @@ public class OrderChildPostServiceImpl implements OrderChildPostService {
 
         if (Objects.equals(poundAuditDetail.getStatus(), OrderChildPoundAuditEnum.Status.APPROVED.getCode())) {
             // 生成计费单
-            Integer settlementDriverDetailId = settlementDriverDetailService.saveSettlementDetail(orderChild);
-            Integer settlementOwnerDetailId = settlementOwnerDetailService.saveSettlementDetail(orderChild, orderGoods);
+            SettlementDriverDetail settlementDriverDetail = settlementDriverDetailService.saveSettlementDetail(orderChild);
+            Integer settlementOwnerDetailId = settlementOwnerDetailService.saveSettlementDetail(orderChild, orderGoods, settlementDriverDetail);
             log.info("生成计费单 {} ", orderChild.getChildNo());
-            settlementMqService.settlementDetailAdd(settlementDriverDetailId, settlementOwnerDetailId);
+            settlementMqService.settlementDetailAdd(settlementDriverDetail.getId(), settlementOwnerDetailId);
         }
     }
 

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

@@ -43,7 +43,7 @@ public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetai
     private final SettlementDriverDetailStruct settlementOwnerDetailStruct;
 
     @Override
-    public Integer saveSettlementDetail(OrderChild orderChild) {
+    public SettlementDriverDetail saveSettlementDetail(OrderChild orderChild) {
 
         SettlementDriverDetail settlementDriverDetail = new SettlementDriverDetail();
         settlementDriverDetail.setChildNo(orderChild.getChildNo());
@@ -87,7 +87,7 @@ public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetai
 
         settlementDriverDetailDao.saveEntity(settlementDriverDetail);
 
-        return settlementDriverDetail.getId();
+        return settlementDriverDetail;
     }
 
     private BigDecimal weightCalc(BigDecimal loadNet, BigDecimal unLoadNet){

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

@@ -624,6 +624,10 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight());
         settlementOwner.setInvoiceServiceFee(settlementOwnerDetail.getInvoiceServiceFee());
 
+        settlementOwner.setDriverFreight(settlementOwnerDetail.getDriverFreight());
+        settlementOwner.setLoadNet(settlementOwnerDetail.getLoadNet());
+        settlementOwner.setUnloadNet(settlementOwnerDetail.getUnloadNet());
+
         List<SettlementOwnerDetail> details = settlementOwnerDetailDao.getBySettlementNo(settlementOwner.getSettlementNo());
 
         details.forEach(item->{
@@ -636,6 +640,10 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             settlementOwner.setSettlementFreight(settlementOwner.getSettlementFreight().add(item.getSettlementFreight()));
             settlementOwner.setInvoiceFreight(settlementOwner.getInvoiceFreight().add(item.getInvoiceFreight()));
             settlementOwner.setInvoiceServiceFee(settlementOwner.getInvoiceServiceFee().add(item.getInvoiceServiceFee()));
+
+            settlementOwner.setDriverFreight(settlementOwner.getDriverFreight().add(item.getDriverFreight()));
+            settlementOwner.setLoadNet(settlementOwner.getLoadNet().add(item.getLoadNet()));
+            settlementOwner.setUnloadNet(settlementOwner.getUnloadNet().add(item.getUnloadNet()));
         });
 
         settlementOwnerDao.updateSettlementPeriodMonth(settlementOwner);

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

@@ -60,7 +60,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
 
 
     @Override
-    public Integer saveSettlementDetail(OrderChild orderChild, OrderGoods orderGoods) {
+    public Integer saveSettlementDetail(OrderChild orderChild, OrderGoods orderGoods, SettlementDriverDetail settlementDriverDetail) {
 
         SettlementOwnerDetail settlementOwnerDetail = new SettlementOwnerDetail();
         //设置结算方式
@@ -84,6 +84,8 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         settlementOwnerDetail.setFreightPrice(orderChild.getOrderFreightPrice());     //平台运费
         settlementOwnerDetail.setWeight(weightCalc(orderGoods.getSettlementWay(),orderChild.getLoadNet(), orderChild.getUnloadNet()));
         settlementOwnerDetail.setFreight(freightCalc(settlementOwnerDetail.getFreightPrice(), settlementOwnerDetail.getWeight()));
+        settlementOwnerDetail.setDriverFreight(settlementDriverDetail.getSettlementFreight());
+
         settlementOwnerDetail.setLoadRough(orderChild.getLoadRough());
         settlementOwnerDetail.setLoadTare(orderChild.getLoadTare());
         settlementOwnerDetail.setLoadNet(orderChild.getLoadNet());

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

@@ -3,7 +3,6 @@ package com.clx.performance.service.settle;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.settle.SettlementDriverDetail;
-import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverDetailParam;
 import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverDetailParam;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverDetailVO;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -15,7 +14,7 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook;
  */
 public interface SettlementDriverDetailService  {
 
-    Integer saveSettlementDetail(OrderChild orderChild);
+    SettlementDriverDetail saveSettlementDetail(OrderChild orderChild);
 
     IPage<CarrierPageSettlementDriverDetailVO> pageSettlementDriverDetail(PageCarrierSettlementDriverDetailParam param);
 

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

@@ -4,7 +4,7 @@ package com.clx.performance.service.settle;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
-import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverDetailParam;
+import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PagePendingCarrierSettlementOwnerDetailParam;
@@ -20,7 +20,7 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook;
  */
 public interface SettlementOwnerDetailService  {
 
-    Integer saveSettlementDetail(OrderChild orderChild, OrderGoods orderGoods);
+    Integer saveSettlementDetail(OrderChild orderChild, OrderGoods orderGoods, SettlementDriverDetail settlementDriverDetail);
 
     IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param);