From eb9595b12696e5b5160cbb0d91355e855d90999b Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Tue, 5 Jun 2018 18:11:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=A0=E9=99=A4mailgun?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/merchants/core/ClientManager.java | 2 ++ .../merchants/core/impls/ClientManagerImpl.java | 12 +++++++++++- .../system/core/impl/MailGunServiceImpl.java | 2 ++ .../payment/manage/mappers/system/ClientMapper.xml | 5 ++++- .../core/impls/CustomerImpressionImplTest.java | 14 +++++++++++++- 5 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java index a0a2e7bee..a6451d991 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java @@ -304,4 +304,6 @@ public interface ClientManager { JSONObject simpleQuery(JSONObject param, int page,int limit); + JSONObject getByEmail(String email, int page, int limit); + } 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 1e61f1f5f..f1e5120b1 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 @@ -2481,7 +2481,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid JSONObject client = clientDetail(manager, clientMoniker); Assert.notEmpty(client); clientModifySupport.processClientModify(new DisableModify(manager, clientMoniker, false)); - mailGunService.removeMailList(client); + JSONObject sameMailClients = getByEmail(client.getString("contact_email"),1,1); + if(sameMailClients.getJSONObject("data").size()<1) { + mailGunService.removeMailList(client); + } } @Override @@ -3510,4 +3513,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid PageList partners = clientMapper.listPartners(param, new PageBounds(page, limit, Order.formString("create_time.desc"))); return PageListUtils.buildPageListResult(partners); } + + @Override + public JSONObject getByEmail(String email, int page, int limit) { + JSONObject param = new JSONObject(); + param.put("contact_email",email); + return PageListUtils.buildPageListResult(clientMapper.simpleQuery(param,new PageBounds(page, limit))); + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java index 544cf821c..8ee553227 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java @@ -1,6 +1,7 @@ package au.com.royalpay.payment.manage.system.core.impl; import au.com.royalpay.payment.manage.mappers.system.MailSendMapper; +import au.com.royalpay.payment.manage.merchants.core.ClientManager; import au.com.royalpay.payment.manage.system.core.MailGunService; import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient; import au.com.royalpay.payment.tools.mail.MailGunClient; @@ -163,6 +164,7 @@ public class MailGunServiceImpl implements MailGunService { @Override public void removeMailList(JSONObject client) { + mailGunClient.removeClientOfMailList(client.getString("contact_email"),mailListDefault); } 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 372dc3956..a70b85bb1 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 @@ -312,12 +312,15 @@ \ No newline at end of file diff --git a/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java b/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java index c2bf27f4b..1bf968cc9 100644 --- a/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java +++ b/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java @@ -4,6 +4,7 @@ import au.com.royalpay.payment.manage.mappers.payment.OrderMapper; import au.com.royalpay.payment.manage.mappers.system.ClientConfigMapper; import au.com.royalpay.payment.manage.mappers.system.ClientMapper; import au.com.royalpay.payment.manage.mappers.system.OrgMapper; +import au.com.royalpay.payment.manage.merchants.core.ClientManager; import au.com.royalpay.payment.tools.mail.MailGunClient; import au.com.royalpay.payment.tools.mail.SendMail; @@ -37,7 +38,7 @@ import cn.yixblog.platform.http.HttpRequestResult; * Created by wangning on 05/01/2018. */ @SpringBootTest -@ActiveProfiles({ "proxy", "alipay", "wechat", "jd", "bestpay" }) +@ActiveProfiles({ "dev", "alipay", "wechat", "jd", "bestpay" }) @RunWith(SpringRunner.class) public class CustomerImpressionImplTest { @Resource @@ -53,6 +54,8 @@ public class CustomerImpressionImplTest { private MailGunClient mailGunClient; @Resource private ClientConfigMapper clientConfigMapper; + @Resource + private ClientManager clientManager; // @Test // public void redisQueue() { @@ -185,4 +188,13 @@ public class CustomerImpressionImplTest { JSONObject result = mailGunClient.addListMember(client.getString("contact_email"), "merchants@mail.royalpay.com.au", client.getString("contact_person"),"", var); } + + @Test + public void fd(){ + JSONObject asd = clientManager.getByEmail("123@askdjh.com",1,1); + System.out.println(asd); + System.out.println(asd); + System.out.println(asd); + System.out.println(asd); + } } \ No newline at end of file