|
|
|
@ -77,26 +77,18 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
|
|
|
|
|
private ClientManager clientManager;
|
|
|
|
|
@Resource
|
|
|
|
|
private SignInAccountService signInAccountService;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private ClientAccountMapper clientAccountMapper;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private SysClientPreMapperMapper sysClientPreMapperMapper;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private ClientBankAccountMapper clientBankAccountMapper;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private ClientMapper clientMapper;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private ClientRateMapper clientRateMapper;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private ClientConfigMapper clientConfigMapper;
|
|
|
|
|
@Resource
|
|
|
|
|
private PmtSubMerchantIdMapper pmtSubMerchantIdMapper;
|
|
|
|
|
private ThreadPoolExecutor pool = new ThreadPoolExecutor(1, 10, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -352,7 +344,8 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
|
|
|
|
|
sysRate.put("active_time", DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
|
|
|
|
|
sysRate.put("expiry_time", DateFormatUtils.format(DateUtils.addYears(new Date(), 1), "yyyy-MM-dd"));
|
|
|
|
|
|
|
|
|
|
JSONObject rateConfig = clientManager.getSysRateConfig();
|
|
|
|
|
|
|
|
|
|
JSONObject rateConfig = JSONObject.parseObject(sysConfig.getString("sys_apply_rates"));
|
|
|
|
|
JSONObject chooseRate = new JSONObject();
|
|
|
|
|
if (apply.getIntValue("clean_days") == 1) {
|
|
|
|
|
chooseRate = rateConfig.getJSONObject("t1");
|
|
|
|
|