Commit f23e1b857a19214d3286ba6325e7a5a30f624b7e
1 parent
a73e0785
fix：合并差异修正
Showing
1 changed file
with
1 additions
and
2 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
| @@ -62,7 +62,6 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU | @@ -62,7 +62,6 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU | ||
| 62 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; | 62 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; |
| 63 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getSumValue; | 63 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getSumValue; |
| 64 | import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; | 64 | import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 65 | -import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.PAY_ORDER_NOT_FOUND; | ||
| 66 | import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.ORDER_NOT_FOUND; | 65 | import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.ORDER_NOT_FOUND; |
| 67 | import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*; | 66 | import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*; |
| 68 | 67 | ||
| @@ -345,7 +344,7 @@ public class TradeOrderServiceImpl implements TradeOrderService { | @@ -345,7 +344,7 @@ public class TradeOrderServiceImpl implements TradeOrderService { | ||
| 345 | PayOrderRespDTO payOrder = payOrderApi.getOrder(payOrderId); | 344 | PayOrderRespDTO payOrder = payOrderApi.getOrder(payOrderId); |
| 346 | if (payOrder == null) { | 345 | if (payOrder == null) { |
| 347 | log.error("[validateOrderPaid][order({}) payOrder({}) 不存在，请进行处理！]", id, payOrderId); | 346 | log.error("[validateOrderPaid][order({}) payOrder({}) 不存在，请进行处理！]", id, payOrderId); |
| 348 | - throw exception(cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.ORDER_NOT_FOUND); | 347 | + throw exception(ORDER_NOT_FOUND); |
| 349 | } | 348 | } |
| 350 | // 校验支付单已支付 | 349 | // 校验支付单已支付 |
| 351 | if (!PayOrderStatusEnum.isSuccess(payOrder.getStatus())) { | 350 | if (!PayOrderStatusEnum.isSuccess(payOrder.getStatus())) { |