| 
					
				 | 
			
			
				@@ -55,10 +55,8 @@ public class PayServiceImpl implements PayService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String company = "daya"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (userId != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             MusicGroup musicGroup = musicGroupDao.findUserMusicGroup(userId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if(musicGroup != null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if (musicGroup.getOwnershipType().equals(CooperationOrgan.OwnershipType.COOPERATION)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    company = "yadie"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (musicGroup != null && musicGroup.getOwnershipType().equals(CooperationOrgan.OwnershipType.COOPERATION)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                company = "yadie"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -66,7 +64,7 @@ public class PayServiceImpl implements PayService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Map unionPay = new HashMap(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         SysAccount routingAccount = getRoutingAccount(company, amount); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         PaymentChannelTypeEnum paymentChannelType = PaymentChannelTypeEnum.COM; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(routingAccount.getType().equals("PER")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (routingAccount.getType().equals("PER")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             paymentChannelType = PaymentChannelTypeEnum.PER; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Map payMap = null; 
			 |