支付列表,继续支付

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/RedisCacheServiceImpl.java

@@ -151,7 +151,7 @@ public class RedisCacheServiceImpl implements RedisCacheService {
         RBucket<Object> bucket = redissonClient.getBucket(cacheKey);
 
         // 缓存数据
-        bucket.set(config, 120L, TimeUnit.MINUTES);
+        bucket.set(config, 240L, TimeUnit.MINUTES);
     }
 
     /**

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -325,7 +325,31 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
 
     @Override
     public IPage<UserOrderVo> selectPage(IPage<UserOrderVo> page, OrderSearch query) {
-        return page.setRecords(baseMapper.selectPage(page, query));
+        IPage<UserOrderVo> userOrderVoIPage = page.setRecords(baseMapper.selectPage(page, query));
+        List<UserOrderVo> records = userOrderVoIPage.getRecords();
+        if (CollectionUtils.isEmpty(records)) {
+            return userOrderVoIPage;
+        }
+        // 查询支付配置缓存
+        for (UserOrderVo record : records) {
+            if (record.getPaymentVersion().equals(EPaymentVersion.V2)) {
+                // 查询用户下单配置
+                String ret = redisCacheService.getUserOrderConfig(record.getUserId().toString(), record.getOrderType().name());
+                if (!StringUtils.isEmpty(ret) ) {
+                    UserPaymentOrderWrapper.PaymentOrderReqConfig config = UserPaymentOrderWrapper.PaymentOrderReqConfig
+                            .from(ret);
+                    UserPaymentOrderWrapper.PaymentConfig build = UserPaymentOrderWrapper.PaymentConfig.builder()
+                            .orderNo(record.getOrderNo())
+                            .paymentConfig(config)
+                            .paymentType(record.getPaymentVendor())
+                            .build();
+                    record.setPaymentConfig(build);
+                }
+            }
+        }
+
+
+        return userOrderVoIPage;
     }
 
     @Override
@@ -480,7 +504,6 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             userOrderVo.setOrderDetailList(orderDetailService.getOrderDetilListByOrderNo(userOrderVo.getOrderNo()));
         }
 
-
         // 查询用户下单配置
         String ret = redisCacheService.getUserOrderConfig(query.getUserId().toString(), query.getGoodType());
         if (!StringUtils.isEmpty(ret) && userOrderVo != null) {