Merge remote-tracking branch 'origin/develop' into develop

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

@@ -42,7 +42,7 @@ public interface OrgMapper {
     @AdvanceSelect(addonWhereClause = "is_valid=1 AND parent_org_id is null")
     List<JSONObject> listAllOrgs();
 
-    JSONObject findOrgByBDId(@Param("bd_id") int bd_id);
+    JSONObject findOrgByBDId(@Param("bd_id") String bd_id);
 
     PageList<JSONObject> listOrgWithPages(JSONObject paraams, PageBounds order);
 

src/main/java/au/com/royalpay/payment/manage/merchantid/core/impl/MerchantIdManageServiceImpl.java

@@ -22,9 +22,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMethod;
-import sun.text.normalizer.NormalizerBase;
 
 import javax.annotation.Resource;
 import java.io.IOException;

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

@@ -37,7 +37,7 @@ public interface ClientApply {
 
     List<JSONObject> listBDByOrg(int org_id);
 
-    JSONObject findOrgByBDId(int bd_id);
+    JSONObject findOrgByBDId(String bd_id);
 
     void notifyBD(String client_apply_id);
 }

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

@@ -217,6 +217,7 @@ public class ClientApplyImpl implements ClientApply, ApplicationEventPublisherAw
 
         JSONObject clientConfig = new JSONObject();
         clientConfig.put("client_id",partner.getIntValue("client_id"));
+        clientConfig.put("client_moniker",info.getClientMoniker());
         clientConfigService.save(clientConfig);
 
         JSONObject client_bd = new JSONObject();
@@ -278,7 +279,7 @@ public class ClientApplyImpl implements ClientApply, ApplicationEventPublisherAw
     }
 
     @Override
-    public JSONObject findOrgByBDId(int bd_id) {
+    public JSONObject findOrgByBDId(String bd_id) {
         return orgMapper.findOrgByBDId(bd_id);
     }
 

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

@@ -741,7 +741,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             throw new BadRequestException("Email validating... Wait for a moment");
         }
         int clientId = client.getIntValue("client_id");
-        clientModifySupport.processClientConfigModify(new EmailModify(manager, clientMoniker, 4, null));
+        clientModifySupport.processClientModify(new EmailModify(manager, clientMoniker, 4, null));
         if (ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) {
             int checkBDPermission = clientBDMapper.checkBDPermission(clientId, manager.getString("manager_id"));
             if (checkBDPermission <= 0) {
@@ -802,9 +802,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 try {
                     String emailId = mailService.sendEmail("Your RoyalPay Cross-border Payment has been set up", mailTo,
                             emails.isEmpty() ? "" : StringUtils.join(emails, ","), content);
-                    clientModifySupport.processClientConfigModify(new EmailModify(account, client.getString("client_moniker"), 3, emailId));
+                    clientModifySupport.processClientModify(new EmailModify(account, client.getString("client_moniker"), 3, emailId));
                 } catch (Exception e) {
-                    clientModifySupport.processClientConfigModify(new EmailModify(account, client.getString("client_moniker"), 0, null));
+                    clientModifySupport.processClientModify(new EmailModify(account, client.getString("client_moniker"), 0, null));
                     throw new EmailException("Email Sending Failed", e);
                 }
             }
@@ -849,7 +849,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 try {
                     String emailId = mailService.sendEmail("Your Partner Account Has Been Authenticated Successfully", mailTo,
                             emails.isEmpty() ? "" : StringUtils.join(emails, ","), content);
-                    clientModifySupport.processClientConfigModify(new EmailModify(account, client.getString("client_moniker"), 3, emailId));
+                    clientModifySupport.processClientModify(new EmailModify(account, client.getString("client_moniker"), 3, emailId));
                 } catch (Exception e) {
                     throw new EmailException("Email Sending Failed", e);
                 }
@@ -894,7 +894,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                             mailStatus = 2;
                             break;
                     }
-                    updateClientApproveEmailStatus(mailStatus, null, null);
+                    updateClientApproveEmailStatus(mailStatus, null, client.getString("client_moniker"));
                 } else {
                     logger.debug("get mail status:" + emailId + "-- none");
                     // updateClientApproveEmailStatus(client.getIntValue("client_id"), 0);
@@ -2767,7 +2767,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (open_status == 1) {
             auditModify.setOpen_status(null);
         } else {
-            auditModify.setOpen_status(-1);
+            auditModify.setOpen_status(open_status - 1);
         }
         if(client.getInteger("approve_result")==null || client.getIntValue("approve_result")==4){
             auditModify.setApprove_result(5);

src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/EmailModify.java

@@ -1,13 +1,13 @@
 package au.com.royalpay.payment.manage.merchants.entity.impls;
 
-import au.com.royalpay.payment.manage.merchants.entity.ClientConfigModify;
+import au.com.royalpay.payment.manage.merchants.entity.ClientModify;
 
 import com.alibaba.fastjson.JSONObject;
 
 /**
  * Create by yixian at 2018-04-12 16:43
  */
-public class EmailModify extends ClientConfigModify {
+public class EmailModify extends ClientModify {
     private int approve_email_send;
     private String approve_email_id;
 
@@ -25,8 +25,8 @@ public class EmailModify extends ClientConfigModify {
     @Override
     protected JSONObject getModifyResult() {
         JSONObject modify = new JSONObject();
-        modify.put("approve_email_send", 4);
+        modify.put("approve_email_send", approve_email_send);
-        modify.put("approve_email_id", null);
+        modify.put("approve_email_id", approve_email_id);
         return modify;
     }
 }

src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerApplyController.java

@@ -148,7 +148,7 @@ public class PartnerApplyController {
 
         String bd_id = applyClient.getString("bd_user");
         if(bd_id!=null&&!"".equals(bd_id)){
-            JSONObject bdOrg = clientApply.findOrgByBDId(Integer.parseInt(bd_id));
+            JSONObject bdOrg = clientApply.findOrgByBDId(bd_id);
             view.addObject("bdOrg", bdOrg);
         }
         return view;

src/main/resources/application.properties

@@ -22,7 +22,7 @@ spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.database=1
 
-spring.data.mongodb.host=119.28.215.173
+spring.data.mongodb.host=10.30.0.8
 spring.data.mongodb.port=27017
 spring.data.mongodb.database=admin
 spring.data.mongodb.username=mongouser