| 
					
				 | 
			
			
				@@ -1476,23 +1476,22 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             notifyMap.put("orderNo", model.getOrderNo()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return notifyMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        String notifyUrl = ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        /*String notifyUrl = ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if ("YEEPAY".equals(studentPaymentOrder.getPaymentChannel())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             notifyUrl = baseApiUrl + "/api-mall-portal/payment/callback_yee/" + studentPaymentOrder.getTenantId(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }else if ("ADAPAY".equals(studentPaymentOrder.getPaymentChannel())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             notifyUrl = baseApiUrl + "/api-mall-portal/payment/callback"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             throw new BizException("支付渠道错误"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        String baseApiUrl = sysConfigDao.findConfigValue("base_api_url"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //  receiver类型 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         payMap = payService.getPayMap( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 studentPaymentOrder.getActualAmount(), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 studentPaymentOrder.getBalancePaymentAmount(), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 model.getOrderNo(), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                notifyUrl, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                baseApiUrl + "/api-mall-portal/payment/callback", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 baseApiUrl + "/api-student/studentOrder/paymentResult?type=edu&orderNo=" + model.getOrderNo(), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "商品销售", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 "商品销售", 
			 |