Merge remote-tracking branch 'origin/test' into test

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

@@ -262,7 +262,8 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         orderChildInfo.setPayTime(DateUtils.formatDateTime(orderChild.getPayTime()).get());
         orderChildInfo.setLoadTime(DateUtils.formatDateTime(orderChild.getLoadTime()).get());
         orderChildInfo.setUnloadTime(DateUtils.formatDateTime(orderChild.getUnloadTime()).get());
-        orderChildInfo.setPayFinishedTime(DateUtils.formatDateTime(orderChild.getConfirmTime()).get());
+        orderChildInfo.setPayFinishedTime(orderChild.getConfirmTime()==null?
+                null : DateUtils.formatDateTime(orderChild.getConfirmTime()).get());
         orderChildInfo.setPoundTime(DateUtils.formatDateTime(settlementOwnerDetail.getPoundAuditTime()).get());
 
         orderChildInfo.setReceiveTare(orderChild.getUnloadTare());

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

@@ -10,6 +10,7 @@ import com.clx.performance.param.mq.IntegralOrderChildFinishMqParam;
 import com.clx.performance.service.IntegralMqService;
 import com.clx.performance.service.OrderChildMqService;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
+import com.clx.performance.service.broker.OrderChildBrokerMqService;
 import com.clx.performance.service.child.OrderChildPostService;
 import com.clx.performance.service.settle.SettlementDriverDetailService;
 import com.clx.performance.service.settle.SettlementMqService;
@@ -49,6 +50,9 @@ public class OrderChildPostServiceImpl implements OrderChildPostService {
     @Autowired
     private OrderGoodsDao orderGoodsDao;
 
+    @Autowired
+    private OrderChildBrokerMqService orderChildBrokerMqService;
+
     @Override
     public void orderChildAdd(String childNo) {
         // 发送mq 新增运单
@@ -85,6 +89,9 @@ public class OrderChildPostServiceImpl implements OrderChildPostService {
 
         // 发送mq 司机确认收货
         orderChildMqService.orderChildDriverConfirm(orderChild.getChildNo());
+
+        // 发送mq (更新无车承运)
+        orderChildBrokerMqService.orderChildUpdate(orderChild.getChildNo());
     }
 
 

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

@@ -252,7 +252,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         CountOwnerSettlementOwnerDetailVO vo = new CountOwnerSettlementOwnerDetailVO();
         vo.setOrderChildSum(page.getTotal());
         vo.setLoadNetSum(page.getRecords().stream().map(SettlementOwnerDetail::getLoadNet).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
-        vo.setInvoiceFreightSum(page.getRecords().stream().map(SettlementOwnerDetail::getInvoiceFreight).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+        vo.setInvoiceFreightSum(page.getRecords().stream().map(SettlementOwnerDetail::getInvoiceFreight).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add).movePointLeft(2));
         return vo;
     }
 
@@ -642,18 +642,18 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(vo.getLoadNet()));
             rowData.add(new ExcelData(vo.getUnloadNet()));
             rowData.add(new ExcelData(vo.getWeight()));
-            rowData.add(new ExcelData(vo.getFreightPrice()));
-            rowData.add(new ExcelData(vo.getFreight()));
+            rowData.add(new ExcelData(vo.getFreightPrice()==null?null:vo.getFreightPrice().movePointLeft(2)));
+            rowData.add(new ExcelData(vo.getFreight()==null?null:vo.getFreight().movePointLeft(2)));
             rowData.add(new ExcelData(vo.getLossWeight()));
-            rowData.add(new ExcelData(vo.getLossPrice()));
+            rowData.add(new ExcelData(vo.getLossPrice()==null?null:vo.getLossPrice().movePointLeft(2)));
 
-            rowData.add(new ExcelData(vo.getLossFreight()));
+            rowData.add(new ExcelData(vo.getLossFreight()==null?null:vo.getLossFreight().movePointLeft(2)));
             rowData.add(new ExcelData(vo.getInvoiceServiceFeeRate()));
-            rowData.add(new ExcelData(vo.getInvoiceServiceFee()));
-            rowData.add(new ExcelData(vo.getPrepayFreight()));
-            rowData.add(new ExcelData(vo.getLoanFreight()));
-            rowData.add(new ExcelData(vo.getSettlementFreight()));
-            rowData.add(new ExcelData(vo.getInvoiceFreight()));
+            rowData.add(new ExcelData(vo.getInvoiceServiceFee()==null?null:vo.getInvoiceServiceFee().movePointLeft(2)));
+            rowData.add(new ExcelData(vo.getPrepayFreight()==null?null:vo.getPrepayFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(vo.getLoanFreight()==null?null:vo.getLoanFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(vo.getSettlementFreight()==null?null:vo.getSettlementFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(vo.getInvoiceFreight()==null?null:vo.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(vo.getOrderNo()));
             rowData.add(new ExcelData(vo.getSettlementNo()));
             rowData.add(new ExcelData(vo.getSettlementSubNo()));