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

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()));