Merge branch 'feature/0721-tenant' into develop

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

@@ -1032,8 +1032,10 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
             if (Objects.isNull(teacher)) {
                 throw new BizException("推荐人信息不存在");
             }
-            if (teacher.getTenantId() != null && teacher.getTenantId() > 0 && ESettlementFrom.TENANT.equals(teacher.getSettlementFrom())) {
-                resp.setPaymentVersion(EPaymentVersion.V2);
+            if (!payTypeReq.getClientType().equals(ClientEnum.TEACHER)) {
+                if (teacher.getTenantId() != null && teacher.getTenantId() > 0 && ESettlementFrom.TENANT.equals(teacher.getSettlementFrom())) {
+                    resp.setPaymentVersion(EPaymentVersion.V2);
+                }
             }
         }