diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 90f12b218..592c8cedd 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -545,7 +545,6 @@ public class RetailAppServiceImp implements RetailAppService { @Override public JSONObject userInfo(JSONObject device) { - logger.debug("userinfo device json:" + device.toJSONString()); String accountId = device.getString("account_id"); if (accountId != null) { JSONObject user = signInAccountService.getClient(accountId); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 36683e2a7..0343422aa 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -55,6 +55,7 @@ import au.com.royalpay.payment.manage.notice.core.MailService; import au.com.royalpay.payment.manage.signin.beans.TodoNotice; import au.com.royalpay.payment.manage.signin.core.ManagerTodoNoticeProvider; import au.com.royalpay.payment.manage.signin.core.SignInAccountService; +import au.com.royalpay.payment.manage.support.sms.SmsSender; import au.com.royalpay.payment.manage.system.core.ClientContractService; import au.com.royalpay.payment.manage.system.core.MailGunService; import au.com.royalpay.payment.manage.tradelog.beans.TradeLogQuery; @@ -290,6 +291,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid @Resource private MpWechatApiProvider mpWechatApiProvider; + private final int REFUSE_CLIENT_TEMPLID = 166108; + @PostConstruct public void init() { tags.add("account"); @@ -3055,6 +3058,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } saveClientAuditProcess(client.getIntValue("client_id"), open_status, client.getInteger("open_status"), "打回," + refuse_remark, manager); clientModifySupport.processClientModify(auditModify); + if(client.getIntValue("source") == 4){ + client.getString("contact_phone"); + + } try { sendMessageToBD(client, refuse_remark); } catch (Exception e) { diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientModifySupportImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientModifySupportImpl.java index 9a14767e5..b6e108502 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientModifySupportImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientModifySupportImpl.java @@ -37,6 +37,7 @@ public class ClientModifySupportImpl implements ClientModifySupport { @Override public void processClientConfigModify(ClientConfigModify clientConfigModify) { - clientConfigModify.doModify(merchantInfoProvider, clientConfigMapper,clientMapper,mongoTemplate); + int clientId = clientConfigModify.doModify(merchantInfoProvider, clientConfigMapper,clientMapper,mongoTemplate); + clientInfoCacheSupport.clearClientCache(clientId); } } diff --git a/src/main/java/au/com/royalpay/payment/manage/support/sms/SmsSender.java b/src/main/java/au/com/royalpay/payment/manage/support/sms/SmsSender.java new file mode 100644 index 000000000..6d5a779c9 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/support/sms/SmsSender.java @@ -0,0 +1,26 @@ +package au.com.royalpay.payment.manage.support.sms; + +import com.github.qcloudsms.SmsSingleSender; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +/** + * @author kira + * @date 2018/8/1 + */ +@Service +public class SmsSender { + @Value("${royalpay.sms.appid:1400094878}") + private static int appId; + @Value("${royalpay.sms.appkey:43390d81e20c5191c278fbf4cd275be2}") + private static String appKey; + + private static class SmsSenderIner{ + private static SmsSingleSender sender = new SmsSingleSender(appId, appKey); + } + + public static SmsSingleSender getSender(){ + return SmsSenderIner.sender; + } +}