提交 52673685 authored 作者: huyufan's avatar huyufan

修改BUG违约记录

上级 1196c24f
...@@ -165,6 +165,9 @@ public class OrderCancelComponent implements InitializingBean { ...@@ -165,6 +165,9 @@ public class OrderCancelComponent implements InitializingBean {
if (!orderFeign.updateOrderStatusByOrderNo(orderNo, orderStatusCode).succeed()) { if (!orderFeign.updateOrderStatusByOrderNo(orderNo, orderStatusCode).succeed()) {
throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "货主取消订单失败,原因:远程调用取消订单失败"); throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "货主取消订单失败,原因:远程调用取消订单失败");
} }
this.breakContractSettlementOwner(orderNo, orderStatusCode);
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
......
...@@ -111,8 +111,18 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int ...@@ -111,8 +111,18 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
List<OrderChild> listOrderChildByOrderNoAndStatus(String orderNo,List<Integer> status); List<OrderChild> listOrderChildByOrderNoAndStatus(String orderNo,List<Integer> status);
/**
* 通过订单号查询在途运单
* @param orderNo
* @return
*/
List<OrderChild> selectInTransitOrderChild(String orderNo); List<OrderChild> selectInTransitOrderChild(String orderNo);
/**
* 通过货单号查询在途运单
* @param orderGoodsNo
* @return
*/
List<OrderChild> selectInTransitOrderChildByOrderGoodsNo(String orderGoodsNo); List<OrderChild> selectInTransitOrderChildByOrderGoodsNo(String orderGoodsNo);
} }
...@@ -171,7 +171,6 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -171,7 +171,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.NETWORK.getCode()); thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.NETWORK.getCode());
log.info("执行解冻账户,参数:{}", JSONUtil.parse(thawAccountParam)); log.info("执行解冻账户,参数:{}", JSONUtil.parse(thawAccountParam));
ownerAccountService.ownerAccountThaw(thawAccountParam); ownerAccountService.ownerAccountThaw(thawAccountParam);
orderCancelComponent.breakContractSettlementOwner(orderNo, orderStatusCode);
Result<Object> result = orderFeign.updateOrderStatusByOrderNo(orderNo, orderStatusCode); Result<Object> result = orderFeign.updateOrderStatusByOrderNo(orderNo, orderStatusCode);
if (!result.succeed()) { if (!result.succeed()) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论