Merge branch 'feature/1113-vipCourse' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/UserOrderController.java

@@ -389,7 +389,7 @@ public class UserOrderController extends BaseController {
         UserPaymentOrderWrapper.OrderPayTypeResp orderPayTypeResp = userPaymentCoreService.orderPayType(payTypeReq);
 
         // todo 测试固定v2
-        orderPayTypeResp.setPaymentVersion(EPaymentVersion.V2);
+//        orderPayTypeResp.setPaymentVersion(EPaymentVersion.V2);
         return HttpResponseResult.succeed(orderPayTypeResp);
     }
 

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

@@ -1092,7 +1092,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
         
         // 结算给机构的，检测机构的主账户，没有主账户的，查询-1的主账户
         String defaultService = paymentServiceContext.getProperties().getDefaultService();
-        if (EPayerType.ORIGINAL.getCode().toLowerCase().equals(defaultService)) {
+        if (EPayerType.ORIGINAL.getCode().toLowerCase().equals(defaultService) || resp.getPaymentVersion() == EPaymentVersion.V1) {
             // 微信、支付宝原生支付
             if (Objects.isNull(payTypeReq.getClientType())) {
                 throw new BizException("支付客户端类型不能为空");