diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b57b9f590..4890b713f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -119,7 +119,7 @@ royalpay: appkey: 43390d81e20c5191c278fbf4cd275be2 server: - port: 5555 + port: 5000 settle: abafile: diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml index c3d60cc83..15055ae5a 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml @@ -45,12 +45,11 @@ scup.upay_refuse_remark, scup.upay_approve_email_send, scup.upay_approve_email_id, - config.enable_cross_payment, - config.enable_card_payment + cc.enable_cross_payment, + cc.enable_card_payment FROM sys_clients c inner join sys_client_config cc on cc.client_id = c.client_id inner join sys_org o on o.org_id=c.org_id - inner join sys_client_config config on c.client_id = config.client_id left join sys_client_upay_profile scup on scup.client_id = c.client_id INNER JOIN sys_client_bd d ON c.client_id = d.client_id AND d.bd_id = #{bd_user} and