Merge branch 'hotfix' into develop

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -2481,6 +2481,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         JSONObject client = clientDetail(manager, clientMoniker);
         Assert.notEmpty(client);
         clientModifySupport.processClientModify(new DisableModify(manager, clientMoniker, false));
+        mailGunService.removeMailList(client);
     }
 
     @Override

src/main/java/au/com/royalpay/payment/manage/system/core/MailGunService.java

@@ -24,4 +24,6 @@ public interface MailGunService {
 
     JSONObject sendEmail(String notice_id, String title, Set<String> mailTo, String content) throws URISyntaxException, IOException ;
 
+    void removeMailList(JSONObject client);
+
 }

src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java

@@ -161,7 +161,10 @@ public class MailGunServiceImpl implements MailGunService {
         return mailGunClient.sendMail(sendMail);
     }
 
-
+    @Override
+    public void removeMailList(JSONObject client) {
+        mailGunClient.removeClientOfMailList(client.getString("contact_email"),mailListDefault);
+    }
 
     public Map<String, String> getQueryMap(String query) {
         String[] params = query.split("&");