提交 d7f90368 authored 作者: liruixin's avatar liruixin

Merge branch 'v12.4_permanent_taskbar_20240320' into test

# Conflicts: # performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java # performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java # performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java # performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementServiceImpl.java Former-commit-id: e83e6852
...@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor; ...@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import java.time.LocalDateTime;
@ApiModel(description = "运单表") @ApiModel(description = "运单表")
...@@ -38,4 +39,12 @@ public class GoingOrderChildVO { ...@@ -38,4 +39,12 @@ public class GoingOrderChildVO {
private String lastArriveSendTime; 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
...@@ -63,7 +63,8 @@ public class OrderChildDtsListener { ...@@ -63,7 +63,8 @@ public class OrderChildDtsListener {
} }
}else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){ }else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){
log.info("修改:{}",after); 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); orderChildChangeAfter(after);
} }
if(OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){ if(OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){
......
...@@ -177,6 +177,13 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -177,6 +177,13 @@ public class OrderChildServiceImpl implements OrderChildService {
private OrderChildLoanComponent orderChildLoanComponent; private OrderChildLoanComponent orderChildLoanComponent;
@Autowired
private OwnerRunningWaterRecordDao ownerRunningWaterRecordDao;
@Autowired
private OrderChildLoanComponent orderChildLoanComponent;
@Override @Override
public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) { public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
...@@ -1894,6 +1901,8 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -1894,6 +1901,8 @@ public class OrderChildServiceImpl implements OrderChildService {
OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow( OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(
PerformanceResultEnum.ORDER_INVALID); PerformanceResultEnum.ORDER_INVALID);
orderChildVO.setLastArriveSendTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime())); orderChildVO.setLastArriveSendTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime()));
orderChildVO.setLastArriveReceiveTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveReceiveTime()));
orderChildVO.setLastLoadTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastLoadTime()));
} }
return orderChildVO; return orderChildVO;
......
...@@ -119,11 +119,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -119,11 +119,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
private final OwnerInfoService ownerInfoService; private final OwnerInfoService ownerInfoService;
private final PlatformAccountConfigService platformAccountConfigService;
private final OwnerLoanAccountDao ownerLoanAccountDao; private final OwnerLoanAccountDao ownerLoanAccountDao;
private final OwnerLoanAccountStruct ownerLoanAccountStruct; private final OwnerLoanAccountStruct ownerLoanAccountStruct;
private final PlatformAccountConfigService platformAccountConfigService;
@Override @Override
public IPage<OwnerAccountVO> pageList(PageOwnerAccountListParam param) { public IPage<OwnerAccountVO> pageList(PageOwnerAccountListParam param) {
......
...@@ -87,6 +87,11 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -87,6 +87,11 @@ public class SettlementServiceImpl implements SettlementService {
settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode()); settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO); 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;
} }
// 结算金额 // 结算金额
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论