Merge branch 'refs/heads/v18.5_pound_list_ocr_20240701' into test

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildPoundInfoVO.java

@@ -64,4 +64,10 @@ public class OrderChildPoundInfoVO {
 
     @ApiModelProperty(value = "首次交货时间")
     private String firstUnloadTime;
+
+    @ApiModelProperty(value = "装货时间")
+    private String loadTime;
+
+    @ApiModelProperty(value = "交货时间")
+    private String unloadTime;
 }
\ No newline at end of file

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

@@ -252,6 +252,9 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         //本次调整金额
         BigDecimal platformServiceFeeNew = BigDecimal.ZERO;
         log.info("运单号 {} ，原始冻结金额 {} ",orderChild.getChildNo(),platformServiceFee);
+        if(Objects.isNull(platformServiceFee)){
+            return   PaymentDTO.builder().changeDeposit(null).platformServiceFeeNew(null).build();
+        }
         if(freight.compareTo(BigDecimal.ZERO)<=0){
             return   PaymentDTO.builder().changeDeposit(platformServiceFee.multiply(new BigDecimal("-1"))).platformServiceFeeNew(platformServiceFeeNew).build();
         }

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

@@ -987,7 +987,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
         orderChild.setStatus(OrderChildEnum.Status.LOAD.getCode());
-        orderChild.setFirstLoadTime(orderChild.getLoadTime());
+        orderChild.setFirstLoadTime(LocalDateTime.now());
         orderChildDao.updateLoad(orderChild);
 
         orderChildImageDao.batchSaveEntity(imageList);
@@ -1172,7 +1172,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setStatus(OrderChildEnum.Status.UNLOAD.getCode());
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
         orderChild.setFreight(orderChildFreightCalc(orderChild));
-        orderChild.setFirstUnloadTime(orderChild.getUnloadTime());
+        orderChild.setFirstUnloadTime(LocalDateTime.now());
 
         OrderChildPoundAudit audit = new OrderChildPoundAudit();
         audit.setChildNo(childNo);
@@ -1949,6 +1949,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         result.setFirstLoadTime(orderChild.getFirstLoadTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getFirstLoadTime()));
         result.setArriveReceiveTime(orderChild.getArriveReceiveTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getArriveReceiveTime()));
         result.setFirstUnloadTime(orderChild.getFirstUnloadTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getFirstUnloadTime()));
+        result.setLoadTime(orderChild.getLoadTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getLoadTime()));
+        result.setUnloadTime(orderChild.getUnloadTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getUnloadTime()));
 
         return result;
     }