update

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

@@ -210,12 +210,12 @@ public class PayServiceImpl implements PayService {
 		List<Integer> ignoreOrganList = Arrays.asList(4, 55, 59);
 		
 		//查询商品收款账户配置
-        String goodsSellReceiptMerNo = sysConfigDao.findConfigValue("goodsSellReceiptMerNo");
+        String goodsSellReceiptOrganId = sysConfigDao.findConfigValue("goodsSellReceiptOrganId");
         
-        if(!ignoreOrganList.contains(organId) && StringUtils.isNotBlank(goodsSellReceiptMerNo)){
+        if(!ignoreOrganList.contains(organId) && StringUtils.isNotBlank(goodsSellReceiptOrganId)){
 			
         	//根据商户号查询对应分部
-        	SysPaymentConfig sysPaymentConfig = sysPaymentConfigService.findPaymentConfigByMerNo(StringUtils.trim(goodsSellReceiptMerNo));
+        	SysPaymentConfig sysPaymentConfig = sysPaymentConfigService.findPaymentConfigByOrganId(paymentChannel, Integer.parseInt(goodsSellReceiptOrganId));
         	
         	if(sysPaymentConfig != null){
 
@@ -377,7 +377,7 @@ public class PayServiceImpl implements PayService {
     	            studentPaymentRouteOrder.setFeeFlag("Y");
     	            studentPaymentRouteOrder.setRouteAmount(subCashAmount);
     	            studentPaymentRouteOrder.setRouteBalanceAmount(subBalance);
-    	            studentPaymentRouteOrder.setMerNo(goodsSellReceiptMerNo);
+    	            studentPaymentRouteOrder.setMerNo(sysPaymentConfig.getHfMerNo());
     	            studentPaymentRouteOrder.setSaleAmount(BigDecimal.ZERO);
     	            studentPaymentRouteOrder.setServiceAmount(subCashAmount);
     	            studentPaymentRouteOrder.setTenantId(tenantId);
@@ -392,7 +392,7 @@ public class PayServiceImpl implements PayService {
     	            routeScaleDtoForGoodsSell.setPayType(PaymentChannelEnum.ADAPAY);
     	            routeScaleDtoForGoodsSell.setFeeType(FeeTypeEnum.SERVICE);
     	            routeScaleDtoForGoodsSell.setScale(100);
-    	            routeScaleDtoForGoodsSell.setMerNo(goodsSellReceiptMerNo);
+    	            routeScaleDtoForGoodsSell.setMerNo(sysPaymentConfig.getHfMerNo());
     	            routeScaleDtoForGoodsSell.setFeeFlag("Y");
         		}
         	}