Merge branch 'fix/1217' into develop-new

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

@@ -1162,6 +1162,7 @@ DISCOUNT("畅学卡")
                 .merOrderNo(reqConfig.getMerOrderNo())
                 .code(reqConfig.getCode());
 
+            config.setPaymentVendor(userPaymentOrder.getPaymentVendor());
             config.setIp(reqConfig.getIp());
             // 重新格式化设置价格
             config.setPrice(config.getPrice().setScale(2, RoundingMode.HALF_UP));
@@ -1239,7 +1240,7 @@ DISCOUNT("畅学卡")
 
             // 下单未拉起三方支付，直接关闭
             if (StringUtils.isEmpty(paymentOrder.getTransNo())
-                    && (EPaymentStatus.WAIT_PAY == paymentOrder.getStatus()||EPaymentStatus.PAYING == paymentOrder.getStatus())) {
+                    && (EPaymentStatus.WAIT_PAY == paymentOrder.getStatus())) {
 
                 closeWaitOrder(paymentOrder);
 
@@ -1659,8 +1660,11 @@ DISCOUNT("畅学卡")
         if (Objects.isNull(detail)) {
             throw new BizException("订单信息不存在");
         }
+        List<UserOrderDetailVo> collect = detail.getOrderDetailList();
+        if (orderDetailIds != null) {
+            collect = detail.getOrderDetailList().stream().filter(o -> orderDetailIds.contains(o.getId())).collect(Collectors.toList());
+        }
 
-        List<UserOrderDetailVo> collect = detail.getOrderDetailList().stream().filter(o -> orderDetailIds.contains(o.getId())).collect(Collectors.toList());
         BigDecimal reduce = collect.stream().map(o -> o.getActualPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
         // 提交退款申请记录
         UserOrderRefund userRefundOrder = new UserOrderRefund();