소스 검색

Merge branch 'feature/0721-tenant' into develop

liujc 1 년 전
부모
커밋
6b7f4b08ff
1개의 변경된 파일4개의 추가작업 그리고 2개의 파일을 삭제
  1. 4 2
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserPaymentCoreServiceImpl.java

+ 4 - 2
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);
+                }
             }
         }