Merge branch 'v12.4_permanent_taskbar_20240320' into test

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

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import java.time.LocalDateTime;
 
 
 @ApiModel(description = "运单表")
@@ -38,4 +39,12 @@ public class GoingOrderChildVO {
     private String lastArriveSendTime;
 
 
+    @ApiModelProperty(value = "最晚到达目的地时间", example = "2012-01-01 00:00:00")
+    private String lastArriveReceiveTime;
+
+
+    @ApiModelProperty(value = "最晚装货时间", example = "2012-01-01 00:00:00")
+    private String lastLoadTime;
+
+
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

@@ -63,7 +63,8 @@ public class OrderChildDtsListener  {
                 }
             }else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){
                 log.info("修改:{}",after);
-                if(OrderChildEnum.SYNC_STATUS_lIST.contains(after.getStatus()) && !Objects.equals(before.getStatus(),after.getStatus())){
+                if(OrderChildEnum.SYNC_STATUS_lIST.contains(after.getStatus()) &&
+                        (!Objects.equals(before.getStatus(),after.getStatus()) || !Objects.equals(before.getLoadNet(),after.getLoadNet()))){
                     orderChildChangeAfter(after);
                 }
                 if(OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){

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

@@ -177,6 +177,13 @@ public class OrderChildServiceImpl implements OrderChildService {
     private OrderChildLoanComponent orderChildLoanComponent;
 
 
+    @Autowired
+    private OwnerRunningWaterRecordDao ownerRunningWaterRecordDao;
+
+    @Autowired
+    private OrderChildLoanComponent orderChildLoanComponent;
+
+
     @Override
     public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
 
@@ -1894,6 +1901,8 @@ public class OrderChildServiceImpl implements OrderChildService {
             OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(
                     PerformanceResultEnum.ORDER_INVALID);
             orderChildVO.setLastArriveSendTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime()));
+            orderChildVO.setLastArriveReceiveTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveReceiveTime()));
+            orderChildVO.setLastLoadTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastLoadTime()));
         }
 
         return orderChildVO;

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

@@ -119,11 +119,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
     private final OwnerInfoService ownerInfoService;
 
+    private final PlatformAccountConfigService platformAccountConfigService;
+
     private final OwnerLoanAccountDao ownerLoanAccountDao;
 
     private final OwnerLoanAccountStruct ownerLoanAccountStruct;
 
-    private final PlatformAccountConfigService platformAccountConfigService;
 
     @Override
     public IPage<OwnerAccountVO> pageList(PageOwnerAccountListParam param) {

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

@@ -87,6 +87,11 @@ public class SettlementServiceImpl implements SettlementService {
                 settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
                 settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
             }
+            Message message = MessageBuilder.withBody(JSONUtil.parse(orderChild).toString().getBytes()).build();
+            rabbitTemplate.send(
+                    RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_EXCHANGE, RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_ROUTE_KEY, message
+            );
+            return;
         }
 
         // 结算金额