Merge branch 'saas' into master_saas

audio-analysis/src/main/java/com/yonge/netty/dto/UserChannelContext.java

@@ -38,7 +38,7 @@ public class UserChannelContext {
 	//打击乐
 	private final static List<Integer> percussionList = Arrays.asList(23, 113);
 	
-	private final static int MIN_FREQUECY = 100;
+	private final static int MIN_FREQUECY = 43;
 	
 	private final static int MAX_FREQUECY = 2000;
 	

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

@@ -412,8 +412,20 @@ public class PayServiceImpl implements PayService {
         if(routeScaleDtoForGoodsSell != null){
         	routeScaleDtos.add(routeScaleDtoForGoodsSell);
         }
+        
+        Map<String, Object> map = getPayRoute(amount, balanceAmount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody, routeScaleDtos, subCashAmount);
+        
+		if (routeScaleDtoForGoodsSell != null) {
+			String routingMerNos = (String) map.get("routingMerNos");
+			List<String> list = new ArrayList<String>(Arrays.asList(routingMerNos.split(",")));
+			if(!list.contains(routeScaleDtoForGoodsSell.getMerNo())){
+				list.add(routeScaleDtoForGoodsSell.getMerNo());
+			}
 
-        return getPayRoute(amount, balanceAmount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody, routeScaleDtos, subCashAmount);
+	        map.put("routingMerNos", String.join(",", list));
+		}
+        
+        return map;
     }
 
     @Override