承运与无车承运对接

performance-web/src/main/java/com/clx/performance/controller/temp/TempSettlementController.java

@@ -3,7 +3,9 @@ package com.clx.performance.controller.temp;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.listener.OrderChildSyncTransportListener;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.service.settle.SettlementMqHandlerService;
 import com.clx.performance.service.settle.SettlementMqService;
+import com.clx.performance.vo.mq.SettlementStatisticsMqParam;
 import com.msl.common.result.Result;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +31,20 @@ public class TempSettlementController {
     private SettlementMqService settlementMqService;
     @Autowired
     private OrderChildSyncTransportListener orderChildSyncTransportListener;
+    @Autowired
+    private SettlementMqHandlerService settlementMqHandlerService;
+
+    @ApiOperation(value = "settlementStatistics", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/settlementStatistics", method = RequestMethod.GET)
+    public Result settlementStatistics(String childNo) {
+
+        SettlementStatisticsMqParam mq = new SettlementStatisticsMqParam();
+        mq.setChildNo(childNo);
+        mq.setInvoiceType(1);
+        settlementMqHandlerService.settlementStatistics(mq);
 
+        return Result.ok();
+    }
 
     @ApiOperation(value = "运单同步broker", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/orderChildSync", method = RequestMethod.GET)

performance-web/src/main/java/com/clx/performance/listener/OrderChildSyncTransportListener.java

@@ -169,6 +169,7 @@ public class OrderChildSyncTransportListener {
                 && Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
             settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
             settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
+            settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
         }
         else if (Objects.equals(invoiceType, SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
 

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

@@ -212,6 +212,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             if (Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),
                     QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())
                     && Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
+                settlementDriverDetail.setSettlementNo(settlementNo);
                 //插入同步网络货运待支付记录
                 childSyncTransportRecordService.addOrderChildSyncTransportRecord(settlementDriverDetail);
             }