Merge branch 'fix/1217' into test

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

@@ -1131,7 +1131,7 @@ DISCOUNT("畅学卡")
         try {
 
             // 已产生三方交易流水号，先判断三方订单支付状态若在支付中，则重复返回相同支付配置参数;避免用户重复支付
-            if (StringUtils.isNotBlank(userPaymentOrder.getTransNo())) {
+            if (StringUtils.isNotBlank(userPaymentOrder.getTransNo()) || EPaymentStatus.PAYING == userPaymentOrder.getStatus()) {
 
                 // 获取缓存配置信息
                 String paymentConfig = redisCacheService.getUserPaymentConfig(reqConfig.getUserId(), userPaymentOrder.getOrderNo());