zouxuan 5 gadi atpakaļ
vecāks
revīzija
6234030ccb

+ 0 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java

@@ -143,7 +143,6 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 	public SysUserTsign register(Integer userId, String realName, String idCardNo, String mobileNo) {
 
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
-
 		if (sysUserTsign == null) {
 
 			String accountId = eSealPlugin.createUserAccount(realName, idCardNo, mobileNo);

+ 4 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/PayServiceImpl.java

@@ -55,8 +55,10 @@ public class PayServiceImpl implements PayService {
         String company = "daya";
         if (userId != null) {
             MusicGroup musicGroup = musicGroupDao.findUserMusicGroup(userId);
-            if (musicGroup.getOwnershipType().equals(CooperationOrgan.OwnershipType.COOPERATION)) {
-                company = "yadie";
+            if(musicGroup != null){
+                if (musicGroup.getOwnershipType().equals(CooperationOrgan.OwnershipType.COOPERATION)) {
+                    company = "yadie";
+                }
             }
         }
 

+ 6 - 5
mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -1036,11 +1036,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				}
 			}
 		}
-
-		try {
-			contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
-		} catch (Exception e) {
-			e.printStackTrace();
+		if(!"36".equals(user.getOrganId())){
+			try {
+				contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 		}
 
 		String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");