update

src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java

@@ -2,6 +2,8 @@ package au.com.royalpay.payment.manage.mappers.system;
 
 import com.alibaba.fastjson.JSONObject;
 
+import java.util.List;
+
 import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
 import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
 import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
@@ -16,4 +18,7 @@ public interface MailSendMapper {
 
     @AutoSql(type = SqlType.UPDATE)
     void update(JSONObject record);
+
+    @AutoSql(type = SqlType.SELECT)
+    JSONObject find(String emailId, String contact_email);
 }

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

@@ -71,6 +71,8 @@ public interface ClientManager {
 
     void checkEmailStatus();
 
+    void newCheckEmailStatus();
+
     @Transactional
     void switchPermission(JSONObject manager, String clientMoniker, String permissionKey, boolean allow);
 

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

@@ -29,6 +29,7 @@ import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientRateMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientsContractMapper;
 import au.com.royalpay.payment.manage.mappers.system.CommoditiesMapper;
+import au.com.royalpay.payment.manage.mappers.system.MailSendMapper;
 import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
 import au.com.royalpay.payment.manage.mappers.system.OrgMapper;
 import au.com.royalpay.payment.manage.mappers.system.SysWxMerchantApplyMapper;
@@ -266,6 +267,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     private MongoTemplate mongoTemplate;
     @Resource
     private MailGunService mailGunService;
+    @Resource
+    private MailSendMapper mailSendMapper;
 
     private static final String SOURCE_AGREE_FILE = "source_agree_file";
     private static final String CLIENT_BANK_FILE = "client_bank_file";
@@ -935,6 +938,37 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
     }
 
+    @Override
+    public void newCheckEmailStatus() {
+        List<JSONObject> clients = clientMapper.listClientsWithEmailNotVerify();
+        for (JSONObject client : clients) {
+            try {
+                String emailId = client.getString("approve_email_id");
+                JSONObject status = mailSendMapper.find(emailId,client.getString("contact_email"));
+                if (status!=null) {
+                    int statusNo = status.getIntValue("status");
+                    logger.debug("get mail status:" + emailId + "--" + statusNo);
+                    int mailStatus = 3;
+                    switch (statusNo) {
+                        case 1:
+                            mailStatus = 1;
+                            break;
+                        case 2:
+                            mailStatus = 2;
+                            break;
+                    }
+                    updateClientApproveEmailStatus(mailStatus, null, client.getString("client_moniker"));
+                } else {
+                    logger.debug("get mail status:" + emailId + "-- none");
+                    // updateClientApproveEmailStatus(client.getIntValue("client_id"), 0);
+                }
+
+            } catch (Exception e) {
+                logger.error("check email status failed", e);
+            }
+        }
+    }
+
     @Override
     public void switchPermission(JSONObject manager, String clientMoniker, String permissionKey, boolean allow) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);

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

@@ -1,5 +1,6 @@
 package au.com.royalpay.payment.manage.system.core.impl;
 
+import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
 import au.com.royalpay.payment.manage.mappers.system.MailSendMapper;
 import au.com.royalpay.payment.manage.system.core.MailGunService;
 import au.com.royalpay.payment.tools.mail.MailGunClient;
@@ -29,6 +30,9 @@ public class MailGunServiceImpl implements MailGunService {
     @Resource
     private MailGunClient mailGunClient;
 
+    @Resource
+    private ClientMapper clientMapper;
+
     @Value("${mail.mailgun.default.merchantlist}")
     private String mailListDefault;
 

src/main/java/au/com/royalpay/payment/manage/task/PartnerInitEmailChecker.java

@@ -22,6 +22,7 @@ public class PartnerInitEmailChecker {
     public void checkEmailStatus(){
         if (PlatformEnvironment.getEnv().taskEnabled()) {
             clientManager.checkEmailStatus();
+            clientManager.newCheckEmailStatus();
         }
     }
 }