|
@@ -42,6 +42,7 @@ import com.ym.mec.biz.service.PayService;
|
|
|
import com.ym.mec.biz.service.SellOrderService;
|
|
|
import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
|
|
|
import com.ym.mec.biz.service.StudentPaymentOrderService;
|
|
|
+import com.ym.mec.biz.service.SysConfigService;
|
|
|
import com.ym.mec.biz.service.SysPaymentConfigService;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
import com.ym.mec.common.redis.service.RedisCache;
|
|
@@ -144,18 +145,17 @@ public class PayServiceImpl implements PayService {
|
|
|
List<Integer> ignoreOrganList = Arrays.asList(4);
|
|
|
|
|
|
// 是否由平台收款
|
|
|
- //String isPlatformCollection = sysConfigDao.findConfigValue(SysConfigService.IS_OPEN_SMALL_CLASS_INCOME_TO_PLATFORM);
|
|
|
- String isPlatformCollection = "1";
|
|
|
+ String isPlatformCollection = sysConfigDao.findConfigValue(SysConfigService.IS_OPEN_SMALL_CLASS_INCOME_TO_PLATFORM);
|
|
|
|
|
|
if (StringUtils.equals("1", isPlatformCollection) && !ignoreOrganList.contains(organId)) {
|
|
|
|
|
|
//String merNo = sysConfigDao.findConfigValue(SysConfigService.PLATFORM_PAYEE_ACCOUNT);
|
|
|
- String merNo = ConfigInit.merNo;
|
|
|
+ String merNo = "H004233";
|
|
|
if(StringUtils.isBlank(merNo)){
|
|
|
throw new BizException("平台收款账户查询失败");
|
|
|
}
|
|
|
|
|
|
- Integer routeOrganId = 16;
|
|
|
+ Integer routeOrganId = 123;
|
|
|
|
|
|
StudentPaymentRouteOrder studentPaymentRouteOrder = new StudentPaymentRouteOrder();
|
|
|
studentPaymentRouteOrder.setOrderNo(orderNo);
|