|
@@ -265,6 +265,9 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
|
|
|
public UserOrderVo detailApp(UserOrder param) {
|
|
|
|
|
|
UserOrderVo userOrderVo = baseMapper.detailApp(param);
|
|
|
+ if (userOrderVo == null) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
|
|
|
if (userOrderVo.getStatus() == OrderStatusEnum.PAYING ) {
|
|
|
if (userOrderVo.getPaymentVersion() == EPaymentVersion.V1) {
|
|
@@ -277,7 +280,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
|
|
|
userOrderVo = baseMapper.detailApp(param);
|
|
|
|
|
|
// 查询用户下单配置
|
|
|
- String ret = redisCacheService.getUserOrderConfig(param.getUserId().toString(), userOrderVo.getOrderNo());
|
|
|
+ String ret = redisCacheService.getUserOrderConfig(userOrderVo.getUserId().toString(), userOrderVo.getOrderNo());
|
|
|
if (!StringUtils.isEmpty(ret)) {
|
|
|
UserPaymentOrderWrapper.PaymentOrderReqConfig config = UserPaymentOrderWrapper.PaymentOrderReqConfig
|
|
|
.from(ret);
|