|
|
|
@ -420,15 +420,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
|
client.put("temp_sub_merchant", checkSubMerchantIdInCommonPool(subMerchantId));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (client.getIntValue("approve_result") == 1
|
|
|
|
|
|| (client.getIntValue("approve_result") == 2 && (client.getIntValue("source") == 1 || client.getIntValue("source") == 2))) {
|
|
|
|
|
try {
|
|
|
|
|
JSONObject activeRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Wechat");
|
|
|
|
|
if (activeRate != null) {
|
|
|
|
|
client.put("rate_value", activeRate.getDouble("rate_value"));
|
|
|
|
|
}
|
|
|
|
|
} catch (Exception ignore) {
|
|
|
|
|
try {
|
|
|
|
|
JSONObject activeRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Wechat");
|
|
|
|
|
if (activeRate != null) {
|
|
|
|
|
client.put("rate_value", activeRate.getDouble("rate_value"));
|
|
|
|
|
}
|
|
|
|
|
} catch (Exception ignore) {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
client.put("max_customer_surcharge_rate", PlatformEnvironment.getEnv().getMaxCustomerSurchargeRate());
|
|
|
|
|
if (client.getBigDecimal("rate_value") != null) {
|
|
|
|
|