更改超期箱使费的计算顺序

blade-service/blade-los/src/main/java/org/springblade/los/Util/OwBoxUsageFeeUtils.java

@@ -406,9 +406,9 @@ public class OwBoxUsageFeeUtils {
 						failureHandling("3", boxDynamicsRecord, "请先维护基础资料-超期标准");
 						return false;
 					}
-					LocalDateTime ldt1 = bills.getActualEtd().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
-					LocalDateTime ldt2 = polPickUpDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
-					int overdueDays = (int) ChronoUnit.DAYS.between(ldt1, ldt2);
+					LocalDateTime atd = bills.getActualEtd().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+					LocalDateTime polPickUpDateDateTime = polPickUpDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+					int overdueDays = (int) ChronoUnit.DAYS.between(polPickUpDateDateTime, atd);
 					//超期天数
 					if (overdueDays > 0) {
 						FeeCenter feeCenter = this.addFeeCenter(item, bills, fees, storageFeesItems, curExrateList, overdueDays, exrateType, "1");
@@ -1040,9 +1040,9 @@ public class OwBoxUsageFeeUtils {
 					failureHandling("3", boxDynamicsRecord, "请先维护基础资料-超期标准");
 					return false;
 				}
-				LocalDateTime ldt1 = item.getPodEmptyContainerReturnDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
-				LocalDateTime ldt2 = billsHYJK.getActualEta().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
-				int overdueDays = (int) ChronoUnit.DAYS.between(ldt2, ldt1);
+				LocalDateTime podEmptyContainerReturnDate = item.getPodEmptyContainerReturnDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+				LocalDateTime actualEta = billsHYJK.getActualEta().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+				int overdueDays = (int) ChronoUnit.DAYS.between(podEmptyContainerReturnDate, actualEta);
 				//超期天数
 				if (overdueDays > 0) {
 					FeeCenter feeCenter = this.addFeeCenter(item, billsHYJK, fees, storageFeesItems, curExrateList, overdueDays, exrateType, "2");

blade-service/blade-los/src/main/java/org/springblade/los/box/mapper/PutBoxMapper.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--suppress ALL -->
 <mapper namespace="org.springblade.los.box.mapper.PutBoxMapper">
 
     <!-- 通用查询映射结果 -->