Merge branch 'refs/heads/fix_owner_settlement_order_detail_export_20240820' into release

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

@@ -15,6 +15,7 @@ import com.clx.performance.component.OrderCancelComponent;
 import com.clx.performance.component.OwnerAccountComponent;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.OrderChildOperateRecordDao;
 import com.clx.performance.dao.OrderChildPoundAuditDao;
 import com.clx.performance.dao.OrderChildOperateRecordDao;
 import com.clx.performance.dao.OrderGoodsDao;
@@ -23,6 +24,7 @@ import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.extranal.user.OwnerInfoService;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderChildOperateRecord;
 import com.clx.performance.model.OrderChildPoundAudit;
 import com.clx.performance.model.OrderChildOperateRecord;
 import com.clx.performance.model.OrderGoods;

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

@@ -44,11 +44,6 @@ import com.msl.common.base.Optional;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
 import com.msl.common.utils.DateUtils;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDateTime;
-import java.util.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -57,6 +52,11 @@ import org.apache.commons.lang.exception.ExceptionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.util.*;
+
 
 /**
  * @author kavin

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

@@ -348,7 +348,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(dto.getLossWeight()));
             rowData.add(new ExcelData(dto.getLossPrice().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLossFreight().movePointLeft(2)));
-            rowData.add(new ExcelData(dto.getDriverFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getDriverFreight()==null?null:dto.getDriverFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceServiceFeeRate().toString()+ "%"));
             rowData.add(new ExcelData(dto.getInvoiceServiceFee().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getPrepayFreight().movePointLeft(2)));