|
@@ -191,7 +191,6 @@ public class PayServiceImpl implements PayService {
|
|
|
unionPay.put("routingFee", routingFee);
|
|
|
unionPay.put("routingMerNos", routingMerNos);
|
|
|
unionPay.put("routingOrganId", accounts.get(0).getRoutingOrganId());
|
|
|
- unionPay.put("paymentAccountNo", accounts.get(0).getCompany());
|
|
|
return unionPay;
|
|
|
}
|
|
|
|
|
@@ -254,11 +253,11 @@ public class PayServiceImpl implements PayService {
|
|
|
}
|
|
|
List<SysAccount> accounts = sysAccountService.getAccount(company, channel, type, null);
|
|
|
|
|
|
- if (sysConfigDao.findConfigValue("com_account_channel").equals("ADAPAY") &&
|
|
|
- sysConfigDao.findConfigValue("per_account_channel").equals("ADAPAY")
|
|
|
- ) {
|
|
|
+ if (sysConfigDao.findConfigValue("payment_channel").equals("ADAPAY")) {
|
|
|
BigDecimal amount = routingFee.get("COM").add(routingFee.get("PER"));
|
|
|
- accounts = sysAccountService.getAdaAccount(organId, channel, amount);
|
|
|
+ routingFee.put("COM", amount);
|
|
|
+ routingFee.put("PER", BigDecimal.ZERO);
|
|
|
+ accounts = sysAccountService.getAdaAccount(organId, "ADAPAY", amount);
|
|
|
}
|
|
|
|
|
|
for (SysAccount account : accounts) {
|