提示

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

@@ -1086,9 +1086,17 @@ DISCOUNT("畅学卡")
 
         // 默认支付三方
         if (StringUtils.isNotEmpty(reqConfig.getPaymentVendor())
-                && !reqConfig.getPaymentVendor().equals(userPaymentOrder.getPaymentVendor())) {
+                && !(reqConfig.getPaymentVendor().equals(userPaymentOrder.getPaymentVendor())
+                || !reqConfig.getPaymentChannel().equals(userPaymentOrder.getPaymentChannel()))) {
             if (EPaymentStatus.PAYING == userPaymentOrder.getStatus()) {
-                throw new BizException("订单支付发起中，请勿切换支付方式");
+                String errorMsg = "";
+                if ("ali".equals(userPaymentOrder.getPaymentChannel())) {
+                    errorMsg = "支付宝";
+                } else {
+                    errorMsg = "微信";
+                }
+
+                throw new BizException("该订单已选择"+errorMsg+"支付，若需修改请重新下单");
             }
             // 原生支付拉起支付时，可以切换支付渠道
             UserPaymentOrderWrapper.UserPaymentOrder update = UserPaymentOrderWrapper.UserPaymentOrder