|
@@ -529,7 +529,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
|
|
Payment queryPaymentData = res.getData();
|
|
Payment queryPaymentData = res.getData();
|
|
|
|
|
|
//支付成功
|
|
//支付成功
|
|
- if (res.getStatus() && TradeStatusEnum.succeeded.getCode().equals(queryPaymentData.getStatus())
|
|
|
|
|
|
+ if (res.getStatus() && TradeStatusEnum.succeeded.getCode().equals(queryPaymentData.getStatus().getCode())
|
|
&& (OrderStatusEnum.WAIT_PAY.equals(detail.getStatus()) || OrderStatusEnum.PAYING.equals(detail.getStatus()))) {
|
|
&& (OrderStatusEnum.WAIT_PAY.equals(detail.getStatus()) || OrderStatusEnum.PAYING.equals(detail.getStatus()))) {
|
|
//订单已经完成,则完成订单
|
|
//订单已经完成,则完成订单
|
|
orderSuccess(detail);
|
|
orderSuccess(detail);
|