Merge branch 'develop'

master
eason 6 years ago
commit 2b6fea6c23

@ -549,4 +549,6 @@ insert into `royalpay_production`.`sys_configs` ( `config_key`, `config_value`)
ALTER TABLE `sys_client_config`
ADD COLUMN `gateway_alipay_online` tinyint(1) NULL DEFAULT 1 COMMENT '支付宝线上网关使用线上渠道' AFTER `require_remark`;
ALTER TABLE `sys_clients`
ADD COLUMN `gateway_alipay_online` tinyint(1) NULL DEFAULT 1 COMMENT '支付宝线上网关使用线上渠道' AFTER `require_remark`;
ADD COLUMN `gateway_alipay_online` tinyint(1) NULL DEFAULT 1 COMMENT '支付宝线上网关使用线上渠道' AFTER `require_remark`;
alter table pmt_refunds add column remark varchar(200);

@ -4,6 +4,8 @@ import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
import au.com.royalpay.payment.manage.mappers.system.ClientRateMapper;
import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
import au.com.royalpay.payment.manage.merchants.core.ClientManager;
import au.com.royalpay.payment.manage.merchants.core.ClientModifySupport;
import au.com.royalpay.payment.manage.merchants.entity.impls.SwitchPermissionModify;
import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage;
@ -18,6 +20,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.Date;
@ -47,9 +50,11 @@ public class PostponeClientTask {
private ManagerMapper managerMapper;
@Resource
private SynchronizedScheduler synchronizedScheduler;
@Resource
private ClientModifySupport clientModifySupport;
@Scheduled(cron = "0 30 8 * * ?")
@Transactional
public void postponeClient() {
synchronizedScheduler.executeProcess("manage_task:postPoneClient", 120_000, () -> {
Date now = new Date();
@ -91,6 +96,9 @@ public class PostponeClientTask {
clientRateMapper.saveRate(record);
});
if(p.getBooleanValue("tax_in_surcharge")){
clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null,p.getString("client_moniker"),"tax_in_surcharge",false));
}
adminAccounts.forEach(o -> {
sendClientPostponeNotify(o, expireDate);
});

@ -181,6 +181,7 @@
<th>Operator</th>
<th>Compliance</th>
<th>Status</th>
<th>Remark</th>
</tr>
</thead>
<tbody>
@ -200,6 +201,7 @@
</span>
</td>
<td ng-bind="log.status|refundStatus"></td>
<td ng-bind="log.remark"></td>
</tr>
</tbody>
</table>

@ -165,6 +165,7 @@
<th>Operator</th>
<th>Compliance</th>
<th>Status</th>
<th>Remark</th>
</tr>
</thead>
<tbody>
@ -184,6 +185,7 @@
</span>
</td>
<td ng-bind="log.status|refundStatus"></td>
<td ng-bind="log.remark"></td>
</tr>
</tbody>
</table>

Loading…
Cancel
Save