From 0da6e5f9023dd56791ac6c20caf653917f469069 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 19 Feb 2019 13:48:30 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix=20=E8=BF=87=E6=BB=A4=E6=8E=89=E6=9C=AA?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E7=9A=84?=
 =?UTF-8?q?=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/manage/analysis/mappers/ClientAnalysisMapper.xml   | 1 +
 .../payment/merchantid/templates/no_trade_sub_merchant_id.html | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
index 4135ca3e0..86bc1fc60 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
@@ -247,6 +247,7 @@
         (SELECT p.sub_merchant_id FROM sys_clients p INNER JOIN pmt_orders o ON o.client_id = p.client_id AND o.status >4 AND o.confirm_time IS NOT NULL
         WHERE datediff(now(), o.create_time) <= 25 AND p.sub_merchant_id is not null GROUP BY p.sub_merchant_id) AND c.sub_merchant_id IS not null AND c.merchant_id IS NOT NULL
         AND (c.approve_result = 1 OR c.approve_result= 2) AND c.is_valid = 1
+        AND c.enable_wechat = 1
         ]]>
         GROUP by c.sub_merchant_id
     </select>
diff --git a/src/main/ui/static/payment/merchantid/templates/no_trade_sub_merchant_id.html b/src/main/ui/static/payment/merchantid/templates/no_trade_sub_merchant_id.html
index 925e83c5c..25a30ccdb 100644
--- a/src/main/ui/static/payment/merchantid/templates/no_trade_sub_merchant_id.html
+++ b/src/main/ui/static/payment/merchantid/templates/no_trade_sub_merchant_id.html
@@ -16,6 +16,9 @@
             <div>
                 <div class="list-group col-sm-12 col-xs-12"
                      ng-repeat="(key, clients) in notTradeClientsMap">
+                    <a class="list-group-item active col-sm-12 col-xs-12">
+                        {{key|choose_merchant_id}}
+                    </a>
                     <!--
                     <a class="list-group-item active col-sm-12 col-xs-12">
                         {{key|choose_merchant_id}}

From 599c6f7b071901d56abc6bf56df74b30da34c0f4 Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Tue, 19 Feb 2019 16:48:18 +0800
Subject: [PATCH 2/6] fix small warning

---
 .../core/impl/RiskBusinessServiceImpl.java    | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
index b6065a86a..703440f63 100644
--- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
@@ -2,7 +2,6 @@ package au.com.royalpay.payment.manage.riskbusiness.core.impl;
 
 import au.com.royalpay.payment.core.exceptions.EmailException;
 import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
-import au.com.royalpay.payment.core.exceptions.OrderNotExistsException;
 import au.com.royalpay.payment.core.exceptions.OrderNotMatchException;
 import au.com.royalpay.payment.manage.mappers.log.AppMessageLogMapper;
 import au.com.royalpay.payment.manage.mappers.payment.OrderMapper;
@@ -11,9 +10,9 @@ import au.com.royalpay.payment.manage.mappers.riskbusiness.RiskEventMapper;
 import au.com.royalpay.payment.manage.mappers.riskbusiness.RiskFileMapper;
 import au.com.royalpay.payment.manage.mappers.riskbusiness.RiskMaterialMapper;
 import au.com.royalpay.payment.manage.mappers.riskbusiness.RiskOrdersMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientBDMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientDeviceTokenMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
-import au.com.royalpay.payment.manage.mappers.system.ClientBDMapper;
 import au.com.royalpay.payment.manage.notice.core.MailService;
 import au.com.royalpay.payment.manage.pushMessage.APNSMessageHelper;
 import au.com.royalpay.payment.manage.pushMessage.bean.AppManagerMessageBuilder;
@@ -21,31 +20,32 @@ import au.com.royalpay.payment.manage.riskbusiness.core.RiskBusinessService;
 import au.com.royalpay.payment.manage.riskbusiness.core.RiskMaterialService;
 import au.com.royalpay.payment.manage.riskbusiness.core.RiskProcessLogService;
 import au.com.royalpay.payment.manage.riskbusiness.enums.RiskEmailStatusEnum;
+import au.com.royalpay.payment.manage.riskbusiness.enums.RiskOrderTypeEnum;
 import au.com.royalpay.payment.manage.riskbusiness.enums.RiskResultTypeEnum;
 import au.com.royalpay.payment.manage.signin.beans.TodoNotice;
 import au.com.royalpay.payment.manage.signin.core.ManagerTodoNoticeProvider;
 import au.com.royalpay.payment.manage.tradelog.core.TradeLogService;
-import au.com.royalpay.payment.manage.riskbusiness.enums.RiskOrderTypeEnum;
 import au.com.royalpay.payment.tools.device.message.AppMessage;
 import au.com.royalpay.payment.tools.device.message.AppMsgSender;
 import au.com.royalpay.payment.tools.env.PlatformEnvironment;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
+import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
 import au.com.royalpay.payment.tools.locale.LocaleSupport;
 import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
-import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
 import au.com.royalpay.payment.tools.threadpool.RoyalThreadPoolExecutor;
 import au.com.royalpay.payment.tools.utils.PageListUtils;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.Order;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,17 +55,19 @@ import org.springframework.transaction.annotation.Transactional;
 import org.thymeleaf.context.Context;
 import org.thymeleaf.spring4.SpringTemplateEngine;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.text.ParseException;
 import java.util.*;
-import javax.annotation.Resource;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-import java.util.concurrent.TimeUnit;
 
 /**
  * @Author lvjian
@@ -367,7 +369,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         param.put("orderby_type", "update_time");
         JSONObject riskMaterial = getRiskMaterial(param);
         try {
-            String downloadFilename = clientMoniker + "_audit_materials_" + DateFormatUtils.format(new Date(), "dd/MM/yyyy HH:mm:ss").toString() + ".zip";
+            String downloadFilename = clientMoniker + "_audit_materials_" + DateFormatUtils.format(new Date(), "dd/MM/yyyy HH:mm:ss") + ".zip";
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=" + downloadFilename);
             ZipOutputStream zos = new ZipOutputStream(response.getOutputStream());

From 0b909d47ba251f194839c9503ed97acc9e244b51 Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Tue, 19 Feb 2019 17:12:04 +0800
Subject: [PATCH 3/6] [fix]

---
 .../core/impl/RiskBusinessServiceImpl.java    | 169 +++++++++++++++---
 1 file changed, 141 insertions(+), 28 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
index 703440f63..8a0ee29de 100644
--- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
@@ -2,6 +2,7 @@ package au.com.royalpay.payment.manage.riskbusiness.core.impl;
 
 import au.com.royalpay.payment.core.exceptions.EmailException;
 import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
+import au.com.royalpay.payment.core.exceptions.OrderNotExistsException;
 import au.com.royalpay.payment.core.exceptions.OrderNotMatchException;
 import au.com.royalpay.payment.manage.mappers.log.AppMessageLogMapper;
 import au.com.royalpay.payment.manage.mappers.payment.OrderMapper;
@@ -10,9 +11,9 @@ import au.com.royalpay.payment.manage.mappers.riskbusiness.RiskEventMapper;
 import au.com.royalpay.payment.manage.mappers.riskbusiness.RiskFileMapper;
 import au.com.royalpay.payment.manage.mappers.riskbusiness.RiskMaterialMapper;
 import au.com.royalpay.payment.manage.mappers.riskbusiness.RiskOrdersMapper;
-import au.com.royalpay.payment.manage.mappers.system.ClientBDMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientDeviceTokenMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientBDMapper;
 import au.com.royalpay.payment.manage.notice.core.MailService;
 import au.com.royalpay.payment.manage.pushMessage.APNSMessageHelper;
 import au.com.royalpay.payment.manage.pushMessage.bean.AppManagerMessageBuilder;
@@ -20,32 +21,31 @@ import au.com.royalpay.payment.manage.riskbusiness.core.RiskBusinessService;
 import au.com.royalpay.payment.manage.riskbusiness.core.RiskMaterialService;
 import au.com.royalpay.payment.manage.riskbusiness.core.RiskProcessLogService;
 import au.com.royalpay.payment.manage.riskbusiness.enums.RiskEmailStatusEnum;
-import au.com.royalpay.payment.manage.riskbusiness.enums.RiskOrderTypeEnum;
 import au.com.royalpay.payment.manage.riskbusiness.enums.RiskResultTypeEnum;
 import au.com.royalpay.payment.manage.signin.beans.TodoNotice;
 import au.com.royalpay.payment.manage.signin.core.ManagerTodoNoticeProvider;
 import au.com.royalpay.payment.manage.tradelog.core.TradeLogService;
+import au.com.royalpay.payment.manage.riskbusiness.enums.RiskOrderTypeEnum;
 import au.com.royalpay.payment.tools.device.message.AppMessage;
 import au.com.royalpay.payment.tools.device.message.AppMsgSender;
 import au.com.royalpay.payment.tools.env.PlatformEnvironment;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
-import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
 import au.com.royalpay.payment.tools.locale.LocaleSupport;
 import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
+import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
 import au.com.royalpay.payment.tools.threadpool.RoyalThreadPoolExecutor;
 import au.com.royalpay.payment.tools.utils.PageListUtils;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.Order;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,19 +55,17 @@ import org.springframework.transaction.annotation.Transactional;
 import org.thymeleaf.context.Context;
 import org.thymeleaf.spring4.SpringTemplateEngine;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.net.URL;
 import java.text.ParseException;
 import java.util.*;
+import javax.annotation.Resource;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @Author lvjian
@@ -254,7 +252,10 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         if (client != null && StringUtils.isNotBlank(realOrderIds)) {
             String[] orderIdArray = realOrderIds.trim().split(",");
             JSONObject orderInfo = new JSONObject();
-            // 获取订单信息
+            /**
+             * 获取订单信息
+             * 通用号调单与其他类型的调单，订单格式不一样，所以区分
+             */
             if (riskEvent.getIntValue("order_type") == 3) {
                 for (int i = 0; i < orderIdArray.length; i++) {
                     orderInfo = tradeLogService.getOrderDetail(new JSONObject(), riskEvent.getString("client_moniker"), orderIdArray[i], null);
@@ -322,6 +323,14 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         }
         return params;
     }
+
+    /**
+     * 添加风控事件
+     * 更新risk_orders表
+     * 记录风控日志
+     * @param params
+     * @param manager
+     */
     @Override
     public void addRiskEvent(JSONObject params, JSONObject manager) {
         params = getEvent(params);
@@ -359,6 +368,11 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         setRiskOrders(params);
     }
 
+    /**
+     * 下载审核材料
+     * @param riskId
+     * @param response
+     */
     @Override
     public void downloadAuditMaterialZiP(String riskId, HttpServletResponse response) {
 
@@ -369,13 +383,13 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         param.put("orderby_type", "update_time");
         JSONObject riskMaterial = getRiskMaterial(param);
         try {
-            String downloadFilename = clientMoniker + "_audit_materials_" + DateFormatUtils.format(new Date(), "dd/MM/yyyy HH:mm:ss") + ".zip";
+            String downloadFilename = clientMoniker + "_audit_materials_" + DateFormatUtils.format(new Date(), "dd/MM/yyyy HH:mm:ss").toString() + ".zip";
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=" + downloadFilename);
             ZipOutputStream zos = new ZipOutputStream(response.getOutputStream());
-            for(int i=1;i<=6;i++){
-                if(riskMaterial.containsKey("file"+i)){
-                    List<String> fileList= (List<String>)riskMaterial.get("file"+i);
+            for(int i = 1; i <= 6; i++){
+                if(riskMaterial.containsKey("file" + i)){
+                    List<String> fileList= (List<String>) riskMaterial.get("file"+i);
                     for(String fileUrl : fileList){
                         zos.putNextEntry(new ZipEntry("file" + i+fileUrl.substring(fileUrl.lastIndexOf("/"))));
                         InputStream inputStream = new URL(fileUrl).openConnection().getInputStream();
@@ -395,6 +409,14 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         }
     }
 
+    /**
+     * 发送邮件
+     * 更新事件信息
+     * 记录风控日志
+     * App推送消息
+     * @param riskId
+     * @throws IOException
+     */
     @Override
     public void sendUploadEmail(String riskId) throws IOException {
         JSONObject event = getRiskEventDetail(riskId);
@@ -435,6 +457,11 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         });
     }
 
+    /**
+     * App推送消息
+     * 推送类型risk
+     * @param event
+     */
     private void sendAppRiskMessage(JSONObject event){
         JSONObject client = clientMapper.findClientByMoniker(event.getString("client_moniker"));
         logger.debug("sendRiskAppMessage-" + client.getString("client_moniker") + "-" + "risk_id:"+event.getString("risk_id"));
@@ -479,6 +506,15 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         }
     }
 
+    /**
+     * 记录消息推送日志
+     * @param dev_id
+     * @param client_id
+     * @param messageType
+     * @param dev_token
+     * @param remark
+     * @return
+     */
     private JSONObject saveAppMessageLog(String dev_id, int client_id, String messageType, String dev_token, String remark) {
         JSONObject log = new JSONObject();
         log.put("dev_id", dev_id);
@@ -492,6 +528,15 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
 
     }
 
+    /**
+     * 发送拒绝邮件
+     * 判断当前事件处理状态是否合理
+     * 更新事件
+     * 记录风控日志
+     * @param riskId
+     * @param refuseDescription 拒绝说明
+     * @throws IOException
+     */
     @Transactional
     @Override
     public void sendRefuseEmail(String riskId, String refuseDescription) throws IOException {
@@ -520,7 +565,6 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
                 event.put("result_type",RiskResultTypeEnum.MATERIAL_NOT_PASS.getResultType());
                 event.put("submit_url",uploadUrl);
                 riskEventMapper.update(event);
-                // 日志记录
                 riskProcessLogService.addRiskProcessLog(riskId,
                         event.getString("fillin_id"),
                         event.getString("fillin_person"),
@@ -533,6 +577,11 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         });
     }
 
+    /**
+     * 发送催促邮件
+     * @param riskId
+     * @throws IOException
+     */
     @Override
     public void sendUrgeEmail(String riskId) throws IOException {
         JSONObject event = getRiskEventDetail(riskId);
@@ -616,14 +665,47 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         List<JSONObject> orders = new ArrayList();
         int isSendClient = event.getIntValue("is_send_client");
         ctx.setVariable("emailsTos", bdEmails);
+
+        // 内部调单需要密送的人
+        List<String> emailsBccs = new ArrayList<>(Arrays.asList(
+                "locky@royalpay.com.au ", "leo.huang@royalpay.com.au",
+                "mona.zhang@royalpay.com.au", "weixinfengkong@royalpay.com.au", "thomas.li@royalpay.com.au"
+        ));
+
+        /**
+         * 如果发送给商户，则商户为收件人
+         *     如果不是内部调单，抄送bd；
+         *     如果是内部调单，密送bd与上面定义的‘emailsBccs’
+         * 如果没有勾选发送商户
+         *     如果不是内部调单，直接发送商户；
+         *     如果是内部调单，则自定义“"18852852189@163.com"为收件人，密送同上
+         *
+         * Arrays.asList("18852852189@139.com", "1370256381@qq.com")为本地debug模式的测试邮箱
+         */
         if (isSendClient == 1) {
             ctx.setVariable("emailsTos", clientEmails);
             ctx.setVariable("emailsCcs", bdEmails);
             if (orderType == RiskOrderTypeEnum.ROYALPAY_ORDER.getOrderType().intValue()) {
-                ctx.setVariable("emailsBccs", Arrays.asList(
-//                    "locky@royalpay.com.au ", "zoe.tao@royalpay.com.au", "leo.huang@royalpay.com.au",
-//                    "mona.zhang@royalpay.com.au", "weixinfengkong@royalpay.com.au", "thomas.li@royalpay.com.au"
-                        "18852852189@139.com", "1370256381@qq.com"
+                ctx.setVariable("emailsCcs", null);
+                if (PlatformEnvironment.getEnv().isDebug()) {
+                    emailsBccs = new ArrayList<>(Arrays.asList(
+                            "18852852189@139.com", "1370256381@qq.com"
+                    ));
+                }
+                emailsBccs.addAll(bdEmails);
+                ctx.setVariable("emailsBccs", emailsBccs);
+            }
+        } else {
+            if (orderType == RiskOrderTypeEnum.ROYALPAY_ORDER.getOrderType().intValue()) {
+                if (PlatformEnvironment.getEnv().isDebug()) {
+                    emailsBccs = new ArrayList<>(Arrays.asList(
+                            "18852852189@139.com", "1370256381@qq.com"
+                    ));
+                }
+                emailsBccs.addAll(bdEmails);
+                ctx.setVariable("emailsBccs", emailsBccs);
+                ctx.setVariable("emailsTos", Arrays.asList(
+                        "18852852189@163.com"
                 ));
             }
         }
@@ -674,6 +756,11 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         return UPLOAD_MAIL_PREFIX + codeKey;
     }
 
+    /**
+     * 获取风控事件上传的材料
+     * @param param
+     * @return
+     */
     @Override
     public JSONObject getRiskMaterial(JSONObject param) {
         List<JSONObject> riskMaterialList = riskMaterialMapper.findAllMaterials(param.getString("risk_id"));
@@ -682,14 +769,14 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
             List<JSONObject> files = riskFileMapper.findAllFiles(fileNew.getString("material_id"));
             for(JSONObject file : files){
                 int fileType = file.getIntValue("file_type");
-                if(!fileNew.containsKey("file"+fileType)){
+                if(!fileNew.containsKey("file" + fileType)){
                    List<String> fileList = new ArrayList<>();
                    fileList.add(file.getString("file_url"));
-                   fileNew.put("file"+fileType,fileList);
+                   fileNew.put("file" + fileType, fileList);
                 }else{
-                    List<String> fileList = (List<String>)fileNew.get("file"+fileType);
+                    List<String> fileList = (List<String>) fileNew.get("file"+fileType);
                     fileList.add(file.getString("file_url"));
-                    fileNew.put("file"+fileType,fileList);
+                    fileNew.put("file" + fileType, fileList);
                 }
             }
             return fileNew;
@@ -698,6 +785,12 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         return null;
     }
 
+    /**
+     * 由于之前误把system_transaction_id当做order_id，
+     * 所以新增real_order_id作为order_id,
+     * 对已经建立的风控事件，补全real_order_id字段
+     * 后面查找订单时会根据client_id与real_order_id查找
+     */
     @Override
     @Transactional
     public void completeEventRealOrderIds() {
@@ -849,12 +942,17 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         return "";
     }
 
+    /**
+     * 检查是否有需要的调单事件待处理，由前端弹框提醒
+     * @param manager
+     * @param notices
+     */
     @Override
     public void checkTodo(JSONObject manager, List<TodoNotice> notices) {
         /**
          * 1、判断登录的角色是不是BD
          * 2、列出BD管理的商户
-         * 3、
+         * 3、遍历商户，如果有调单事件退出循环，noticeFlag设为true
          */
         if (ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) {
             JSONObject params = new JSONObject();
@@ -891,6 +989,11 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         riskEventMapper.deleteRiskEvent(riskId);
     }
 
+    /**
+     * 某个商户是否存在调单事件
+     * @param clientId
+     * @return
+     */
     @Override
     public JSONObject getNoticeInfo(int clientId) {
 
@@ -914,6 +1017,13 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         return result;
     }
 
+    /**
+     * 调单事件需要上传的材料说明
+     * 微信调单与内部调单是固定的
+     * 支付宝调单由风控人员录入
+     * @param riskId
+     * @return
+     */
     @Override
     public JSONObject getRiskEventMaterialsRemark(String riskId) {
         JSONObject riskEvent = riskEventMapper.findById(riskId);
@@ -1017,11 +1127,14 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         return event;
     }
 
+    /**
+     * risk_orders表补全数据
+     */
     @Override
     public void completeOrderAmount() {
         List<JSONObject> riskEventList = getRiskEvents(null);
         for(JSONObject riskEvent:riskEventList){
-            if(riskEvent.getIntValue("order_type")==4 || StringUtils.isBlank(riskEvent.getString("real_order_ids"))){
+            if(riskEvent.getIntValue("order_type") == 4 || StringUtils.isBlank(riskEvent.getString("real_order_ids"))){
                 continue;
             }
             String[] order_ids=riskEvent.getString("real_order_ids").split(",");

From 8d3605bf070a81854cd9e5b42a6af3ac4210cdbb Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 20 Feb 2019 15:41:47 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix=20=E8=BF=87=E6=BB=A4=E6=8E=89=E6=9C=AA?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E7=9A=84?=
 =?UTF-8?q?=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/dev/web/TestMerchantPassword.java  | 66 +++++++++++++++++++
 .../manage/mappers/system/ManagerMapper.java  |  7 +-
 .../core/impls/ClientManagerImpl.java         | 41 +++++++++++-
 .../wechatclients/WepayWechatApiImpl.java     |  1 +
 .../templates/testMerchantPassword.html       | 49 ++++++++++++++
 5 files changed, 161 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/dev/web/TestMerchantPassword.java
 create mode 100644 src/main/resources/templates/testMerchantPassword.html

diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestMerchantPassword.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestMerchantPassword.java
new file mode 100644
index 000000000..b1ba4cccd
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestMerchantPassword.java
@@ -0,0 +1,66 @@
+package au.com.royalpay.payment.manage.dev.web;
+
+import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
+import au.com.royalpay.payment.manage.support.wechatclients.RedpackWechatApiImpl;
+import au.com.royalpay.payment.tools.connections.mpsupport.beans.WxOauthType;
+import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
+import au.com.royalpay.payment.tools.permission.wechat.WechatMapping;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.globalfreepay.payment.tools.CommonConsts;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
+
+
+@Controller
+@WechatMapping(value = "/testMerchantPassword", addonMp = {RedpackWechatApiImpl.class}, oauthType = WxOauthType.USERINFO)
+public class TestMerchantPassword {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Resource
+    private ManagerMapper managerMapper;
+
+    @WechatMapping(method = RequestMethod.GET)
+    public String testMerchantPassword(@RequestParam String[] accounts, @ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser, Model modelMap) {
+        if (accounts == null) {
+            return null;
+        }
+
+        List<String> openIds = managerMapper.listDevAndBdOpenId();
+
+        if (!openIds.contains(wxUser.getString("openid"))) {
+            throw new ForbiddenException("无权限查看此页面");
+        }
+
+        JSONArray array = new JSONArray();
+        for (String account : accounts) {
+            try {
+                String accountDe = URLDecoder.decode(account, "UTF-8");
+                JSONObject accountJson = new JSONObject();
+                String temp[] = accountDe.split(",");
+                accountJson.put("username", temp[0]);
+                accountJson.put("password", temp[1]);
+                accountJson.put("role", temp[2]);
+                accountJson.put("client_moniker", temp[3]);
+
+                array.add(accountJson);
+
+            } catch (UnsupportedEncodingException e) {
+                logger.error("获取临时密码失败，转换url错误 ： " + e);
+            }
+        }
+
+        modelMap.addAttribute("accounts", array);
+
+        return "testMerchantPassword";
+    }
+}
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.java
index 5f3af081a..2c9b2b25c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.java
@@ -65,6 +65,9 @@ public interface ManagerMapper {
 
     List<JSONObject> listServants(@Param("mask") int mask);
 
-    @Select("select email from sys_managers where is_valid=1 AND role & 256 > 0 AND email IS NOT NULL")
-    List<String> listDevManager();
+    @Select("select email from sys_managers where is_valid=1 AND (role & 256 > 0 OR role & 4 > 0) AND email IS NOT NULL")
+    List<String> listDevAndBdManager();
+
+    @Select("select wx_openid from sys_managers where is_valid=1 AND (role & 256 > 0 OR role & 4 > 0) AND wx_openid IS NOT NULL")
+    List<String> listDevAndBdOpenId();
 }
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 e0f2f3742..807ea49c1 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
@@ -4443,17 +4443,56 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
 
 
     private void sendTestMerchantPassword(List<JSONObject> accounts, List<String> emails) {
+        List<String> devAndBdEmails = managerMapper.listDevAndBdManager();
+        for(int i=0;i<devAndBdEmails.size();i++){
+            if(StringUtils.isBlank(devAndBdEmails.get(i)))
+                devAndBdEmails.remove(i);
+        }
+
         Context ctx = new Context();
         ctx.setVariable("accounts", accounts);
         final String content = thymeleaf.process( "mail/test_merchant_password", ctx);
         new Thread(() -> {
             try {
-                mailService.sendEmail("测试商户账户已更新", emails.isEmpty() ? "" : StringUtils.join(emails, ","), "", content);
+                mailService.sendEmail("测试商户账户已更新", emails.isEmpty() ? "" : StringUtils.join(emails, ","), devAndBdEmails.isEmpty() ? "" : StringUtils.join(devAndBdEmails, ","), content);
             } catch (Exception ignored) {
                 logger.error("邮件发送失败", ignored);
                 throw new BadRequestException("邮件发送失败");
             }
         }).start();
+
+        StringBuffer accountsStr = new StringBuffer("?");
+
+        accounts.forEach(e->{
+            accountsStr.append("accounts=" + e.getString("username") + ","
+                    + e.getString("password") + "," + e.getIntValue("role") + "," + e.getString("client_moniker") + "&");
+        });
+        String account = accountsStr.substring(0, accountsStr.length() - 1);
+
+
+        List<String> wx_openIds = managerMapper.listDevAndBdOpenId();
+        for (String wxopenid : wx_openIds) {
+            if (StringUtils.isNotBlank(wxopenid)) {
+                try {
+                    MpWechatApi paymentApi = mpWechatApiProvider.getNewPaymentApi();
+                    TemplateMessage msg = initSendTestPasswordTemplate(wxopenid, paymentApi.getTemplateId("test-merchant-password"), account);
+                    paymentApi.sendTemplateMessage(msg);
+                } catch (WechatException e) {
+                    logger.error("Wechat Message Error,密码修改完成" + e.getMessage());
+                    publisher.publishEvent(new WechatExceptionEvent(this, e, "测试商户密码修改完成"));
+                }
+            }
+        }
+    }
+
+    private TemplateMessage initSendTestPasswordTemplate(String wxopenid, String templateId,String url) {
+        TemplateMessage msg = new TemplateMessage(wxopenid, templateId, "https://mpay.royalpay.com.au/testMerchantPassword" + url);
+        msg.put("first", "尊敬的用户，该商户下账号密码已重置。", "#000000");
+        msg.put("keyword1", "PINE", "#0000ff");
+        msg.put("keyword2", "账号密码重置", "#000000");
+        msg.put("keyword3", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss,z"), "#000000");
+        msg.put("remark", "点击查看", "#0000FF");
+        return msg;
     }
 
     private String getCBBankShortLink(String longUrl) {
diff --git a/src/main/java/au/com/royalpay/payment/manage/support/wechatclients/WepayWechatApiImpl.java b/src/main/java/au/com/royalpay/payment/manage/support/wechatclients/WepayWechatApiImpl.java
index b111d3676..ecfc5e09e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/support/wechatclients/WepayWechatApiImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/support/wechatclients/WepayWechatApiImpl.java
@@ -31,6 +31,7 @@ public class WepayWechatApiImpl extends AbstractMpWechatClientApi implements MpW
         registerTemplateId("settlement-check-code", "yaXEOjXFpuipk-DsdxYdd8PnD3bWAgDS5vTKJsrFdR4");
         registerTemplateId("daily-green-channel", "vjeNnggHnnRHvBP80lkEEtPk8ouf7JnvrQYDCyxqx4g");
         registerTemplateId("client-postpone", "5eNJ5ZTKWitC1TJClb2coymtNCmOC7d86h0zCrxmGig");
+        registerTemplateId("test-merchant-password","cF_zIhB4VmjdOaDS2_RNVFforyywsKcfjS1yNNgYmWw");
     }
 
     @Override
diff --git a/src/main/resources/templates/testMerchantPassword.html b/src/main/resources/templates/testMerchantPassword.html
new file mode 100644
index 000000000..ee3fa2dbe
--- /dev/null
+++ b/src/main/resources/templates/testMerchantPassword.html
@@ -0,0 +1,49 @@
+<html xmlns:th="http://www.thymeleaf.org" lang="zh">
+
+<style type="text/css">
+    table.gridtable {
+        font-family: verdana,arial,sans-serif;
+        color:#333333;
+        border-width: 1px;
+        border-color: #666666;
+        border-collapse: collapse;
+    }
+    table.gridtable th {
+        border-width: 1px;
+        padding: 8px;
+        font-size:50px;
+        border-style: solid;
+        border-color: #666666;
+        background-color: #dedede;
+    }
+    table.gridtable td {
+        text-align: center;
+        font-size: 33px;
+        border-width: 1px;
+        padding: 8px;
+        border-style: solid;
+        border-color: #666666;
+        background-color: #ffffff;
+    }
+</style>
+<table class="gridtable" style="width: 100%;height: 80%;alignment: center">
+    <thead>
+    <tr>
+        <th>商户</th>
+        <th>角色</th>
+        <th>用户名</th>
+        <th>密码</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr th:each="account : ${accounts}">
+        <td th:text="${account.client_moniker}"></td>
+        <td th:if="${account.role} == 1">admin</td>
+        <td th:if="${account.role} == 2">Manager</td>
+        <td th:if="${account.role} == 3">Cashier</td>
+        <td th:text="${account.username}"></td>
+        <td th:text="${account.password}"></td>
+    </tr>
+    </tbody>
+</table>
+</html>
\ No newline at end of file

From 0f6e1c550f8439de17d3d152bfc7df948d70396e Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Thu, 21 Feb 2019 09:13:50 +0800
Subject: [PATCH 5/6] yeepay sub update

---
 .../partner/templates/update_yeepay_sub_merchant_id.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/payment/partner/templates/update_yeepay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/update_yeepay_sub_merchant_id.html
index 30769c0bf..05059b18a 100644
--- a/src/main/ui/static/payment/partner/templates/update_yeepay_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/update_yeepay_sub_merchant_id.html
@@ -325,7 +325,7 @@
                 </div>
                 <div class="btn-group margin-bottom margin-top">
                     <button class="btn btn-success" type="button"
-                            ng-click="saveYeepayApply(subForm)">Submit
+                            ng-click="updateYeepayApply(subForm)">Submit
                     </button>
                 </div>
             </div>

From d71faf795d40e4869c519a936d1e0e3c29401ab1 Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Thu, 21 Feb 2019 11:14:55 +0800
Subject: [PATCH 6/6] yeepay apply&update

---
 .../core/impls/ClientManagerImpl.java         |  8 ++++
 .../static/payment/partner/partner-manage.js  | 14 ++++++
 .../apply_yeepay_sub_merchant_id.html         | 44 +++++++++++++++++--
 .../update_yeepay_sub_merchant_id.html        | 43 ++++++++++++++++--
 4 files changed, 103 insertions(+), 6 deletions(-)

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 807ea49c1..2fc26c95c 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
@@ -3766,6 +3766,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         JSONObject yeepayConfig = yeePayClientConfigMapper.findMerchantConfig(client.getIntValue("client_id"));
         yeepayConfig.put("company_website",merchantInfo.getString("company_website"));
         yeepayConfig.put("abn",merchantInfo.getString("abn"));
+        yeepayConfig.put("company_name",merchantInfo.getString("company_name"));
+        yeepayConfig.put("contact_phone",merchantInfo.getString("contact_phone"));
+        yeepayConfig.put("contact_email",merchantInfo.getString("contact_email"));
+        yeepayConfig.put("contact_person",merchantInfo.getString("contact_person"));
         SubmerchantRegisterResult result = yeePayClient.registerMerchant(client,yeepayConfig);
         if(result.getStatus().equals("FAILED")){
             throw new BadRequestException(result.getErrorMsg());
@@ -3798,6 +3802,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         yeePayClientConfigMapper.update(yeepayConfig);
         yeepayConfig.put("company_website",merchantInfo.getString("company_website"));
         yeepayConfig.put("abn",merchantInfo.getString("abn"));
+        yeepayConfig.put("company_name",merchantInfo.getString("company_name"));
+        yeepayConfig.put("contact_phone",merchantInfo.getString("contact_phone"));
+        yeepayConfig.put("contact_email",merchantInfo.getString("contact_email"));
+        yeepayConfig.put("contact_person",merchantInfo.getString("contact_person"));
         yeepayConfig.put("mode","UPDATE");
         SubmerchantRegisterResult result = yeePayClient.registerMerchant(client,yeepayConfig);
         if(result.getStatus().equals("FAILED")){
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index d9da711e5..0d86a6440 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -3561,6 +3561,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.yeepay_industries = yeepayIndustryMap.configs();
         $scope.yeepay_business_contents = yeepayBusinessContentMap.configs();
         $scope.subMerchantInfo = angular.copy(subMerchantInfo);
+        if(!$scope.subMerchantInfo.abn){
+            $scope.subMerchantInfo.abn = $scope.subMerchantInfo.acn;
+        }
         var vouchers={};
 
         $scope.directors={};
@@ -3839,6 +3842,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             //         }
             //     }
             // });
+            merchantInfo['company_name'] = $scope.subMerchantInfo.company_name;
+            merchantInfo['contact_person'] = $scope.subMerchantInfo.contact_person;
+            merchantInfo['contact_phone'] = $scope.subMerchantInfo.contact_phone;
+            merchantInfo['contact_email'] = $scope.subMerchantInfo.contact_email;
             merchantInfo['company_website'] = $scope.subMerchantInfo.company_website;
             merchantInfo['abn'] = $scope.subMerchantInfo.abn;
             merchantInfo['executives'] = $scope.executives;
@@ -3871,6 +3878,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.yeepay_industries = yeepayIndustryMap.configs();
         $scope.yeepay_business_contents = yeepayBusinessContentMap.configs();
         $scope.subMerchantInfo = angular.copy(subMerchantInfo);
+        if(!$scope.subMerchantInfo.abn){
+            $scope.subMerchantInfo.abn = $scope.subMerchantInfo.acn;
+        }
         var vouchers={};
 
         $scope.directors={};
@@ -4149,6 +4159,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             //         }
             //     }
             // });
+            merchantInfo['company_name'] = $scope.subMerchantInfo.company_name;
+            merchantInfo['contact_person'] = $scope.subMerchantInfo.contact_person;
+            merchantInfo['contact_phone'] = $scope.subMerchantInfo.contact_phone;
+            merchantInfo['contact_email'] = $scope.subMerchantInfo.contact_email;
             merchantInfo['company_website'] = $scope.subMerchantInfo.company_website;
             merchantInfo['abn'] = $scope.subMerchantInfo.abn;
             merchantInfo['executives'] = $scope.executives;
diff --git a/src/main/ui/static/payment/partner/templates/apply_yeepay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_yeepay_sub_merchant_id.html
index 6eed12f07..4f11f7bef 100644
--- a/src/main/ui/static/payment/partner/templates/apply_yeepay_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_yeepay_sub_merchant_id.html
@@ -39,16 +39,29 @@
                                 </div>
                             </div>
 
+                            <div class="form-group"
+                                 ng-class="{'has-error':subForm.company_name.$invalid && subForm.company_name.$dirty}">
+                                <label class="control-label col-sm-3" for="company_name_input">* Merchant Name</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.company_name"
+                                           type="text" name="company_name" id="company_name_input" required maxlength="50">
+                                    <div ng-messages="subForm.merchant_name.$error" ng-if="subForm.merchant_name.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Fiel</p>
+                                        <p class="small text-danger" ng-message="maxlength">More Than 50</p>
+                                    </div>
+                                </div>
+                            </div>
+
                             <div class="form-group"  ng-class="{'has-error':subForm.company_website.$invalid && subForm.company_website.$dirty}">
                                 <label class="control-label col-sm-3" for="company_website_input">* Website</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_website" required
-                                           type="url" name="company_website" id="company_website_input">
+                                           type="text" name="company_website" id="company_website_input">
                                     <div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                     </div>
-                                    <div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty">
-                                        <p class="small text-danger" ng-message="url">eg:https://www.royalpay.com.au</p>
+                                    <div>
+                                        <p class="small text-danger">eg:https://www.royalpay.com.au or 无网站</p>
                                     </div>
                                 </div>
                             </div>
@@ -320,6 +333,31 @@
                                     </div>
                                 </div>
                             </div>
+
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="contact_name_input">* Contact Name</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.contact_person"
+                                           type="text" name="contact_name" id="contact_name_input">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="contact_phone_input">* Contact Phone</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.contact_phone"
+                                           type="text" name="contact_phone" id="contact_phone_input">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="contact_email_input">* Contact Email</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.contact_email"
+                                           type="text" name="contact_email" id="contact_email_input">
+                                </div>
+                            </div>
+
                         </div>
                     </div>
                 </div>
diff --git a/src/main/ui/static/payment/partner/templates/update_yeepay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/update_yeepay_sub_merchant_id.html
index 05059b18a..5407e34dd 100644
--- a/src/main/ui/static/payment/partner/templates/update_yeepay_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/update_yeepay_sub_merchant_id.html
@@ -39,16 +39,29 @@
                                 </div>
                             </div>
 
+                            <div class="form-group"
+                                 ng-class="{'has-error':subForm.company_name.$invalid && subForm.company_name.$dirty}">
+                                <label class="control-label col-sm-3" for="company_name_input">* Merchant Name</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.company_name"
+                                           type="text" name="company_name" id="company_name_input" required maxlength="50">
+                                    <div ng-messages="subForm.merchant_name.$error" ng-if="subForm.merchant_name.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Fiel</p>
+                                        <p class="small text-danger" ng-message="maxlength">More Than 50</p>
+                                    </div>
+                                </div>
+                            </div>
+
                             <div class="form-group"  ng-class="{'has-error':subForm.company_website.$invalid && subForm.company_website.$dirty}">
                                 <label class="control-label col-sm-3" for="company_website_input">* Website</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_website" required
-                                           type="url" name="company_website" id="company_website_input">
+                                           type="text" name="company_website" id="company_website_input">
                                     <div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                     </div>
-                                    <div ng-messages="subForm.company_website.$error" ng-if="subForm.company_website.$dirty">
-                                        <p class="small text-danger" ng-message="url">eg:https://www.royalpay.com.au</p>
+                                    <div>
+                                        <p class="small text-danger">eg:https://www.royalpay.com.au or 无网站</p>
                                     </div>
                                 </div>
                             </div>
@@ -320,6 +333,30 @@
                                     </div>
                                 </div>
                             </div>
+
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="contact_name_input">* Contact Name</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.contact_person"
+                                           type="text" name="contact_name" id="contact_name_input">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="contact_phone_input">* Contact Phone</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.contact_phone"
+                                           type="text" name="contact_phone" id="contact_phone_input">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="contact_email_input">* Contact Email</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.contact_email"
+                                           type="text" name="contact_email" id="contact_email_input">
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>