From 99893846b1990d19933387e3ba6e1d6d6f5bf1de Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 7 Mar 2019 18:13:11 +0800
Subject: [PATCH 01/38] tmp commit

---
 .../web/RetailValidationController.java       | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
index 5194f557a..b7bda0c8c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
@@ -7,6 +7,8 @@ import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.device.DeviceSupport;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.http.HttpUtils;
+import au.com.royalpay.payment.tools.locale.LocaleSupport;
+import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.code.kaptcha.Producer;
@@ -42,6 +44,11 @@ public class RetailValidationController {
         return deviceSupport.register(devType, registeration);
     }
 
+    @RequestMapping(value = "/devices/{devType}/manage/register", method = RequestMethod.POST)
+    public JSONObject manageRegister(@RequestBody String registeration, @PathVariable String devType) {
+        return deviceSupport.register(devType, registeration);
+    }
+
     @RequestMapping(value = "/sign_in_check", method = RequestMethod.POST)
     public JSONObject signIn(@RequestBody @Valid RetailLoginInfo loginInfo, Errors errors) {
         HttpUtils.handleValidErrors(errors);
@@ -64,6 +71,31 @@ public class RetailValidationController {
         return client;
     }
 
+    @RequestMapping(value = "/manage/sign_in_check", method = RequestMethod.POST)
+    public JSONObject manageSignIn(@RequestBody @Valid RetailLoginInfo loginInfo, Errors errors) {
+        HttpUtils.handleValidErrors(errors);
+        String codeValue = signInStatusManager.getVerifyCode(loginInfo.getCaptchaKey());
+        if (codeValue == null) {
+            throw new BadRequestException("Verification code has expired");
+        }
+        if (!codeValue.equals(loginInfo.getVerifyCode())) {
+            throw new BadRequestException("Verification code is not correct");
+        } else {
+            signInStatusManager.deleteVerifyCodeKey(loginInfo.getCaptchaKey());
+        }
+        String signKey = signInStatusManager.managerSignIn(loginInfo.toLoginInfo());
+        JSONObject manager = signInStatusManager.getCurrentManager(signKey);
+        manager = JSON.parseObject(manager.toJSONString());
+        if (!ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) {
+            throw new BadRequestException(LocaleSupport.localeMessage("error.login.password"));
+        }
+//        if (loginInfo.getDevId() != null) {
+//            deviceSupport.validDeviceWithClient(manager, loginInfo.getDevId());
+//        }
+        manager.put("sign_key", signKey);
+        return manager;
+    }
+
     @RequestMapping(value = "/wechat_app_signin", method = RequestMethod.POST)
     public JSONObject partnerWechatAppSignIn(@RequestBody JSONObject data) {
         JSONObject res = signInStatusManager.partnerWechatAppSignIn(data.getString("code"));

From 4b2416c8ef44da23908aef63926cc850b6a5fe3f Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 8 Mar 2019 11:49:36 +0800
Subject: [PATCH 02/38] =?UTF-8?q?commit=20=E7=99=BB=E5=BD=95=E3=80=81?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appclient/core/ManageAppService.java      |  9 +++++++
 .../core/impls/ManageAppServiceImp.java       | 21 +++++++++++++++
 .../appclient/web/ManageAppController.java    | 26 +++++++++++++++++++
 .../web/RetailValidationController.java       |  5 +++-
 4 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
new file mode 100644
index 000000000..05e8b1477
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
@@ -0,0 +1,9 @@
+package au.com.royalpay.payment.manage.appclient.core;
+
+import com.alibaba.fastjson.JSONObject;
+
+public interface ManageAppService {
+
+    void updateDevToken(JSONObject device, String devToken);
+
+}
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
new file mode 100644
index 000000000..b3d1372c1
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -0,0 +1,21 @@
+package au.com.royalpay.payment.manage.appclient.core.impls;
+
+import au.com.royalpay.payment.manage.appclient.core.ManageAppService;
+import au.com.royalpay.payment.tools.device.DeviceSupport;
+import au.com.royalpay.payment.tools.device.ManageDeviceSupport;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class ManageAppServiceImp implements ManageAppService {
+
+    @Resource
+    private ManageDeviceSupport manageDeviceSupport;
+
+    @Override
+    public void updateDevToken(JSONObject device, String devToken) {
+        manageDeviceSupport.updateDeviceMessageToken(device, devToken);
+    }
+}
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
new file mode 100644
index 000000000..bd895de5b
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -0,0 +1,26 @@
+package au.com.royalpay.payment.manage.appclient.web;
+
+import au.com.royalpay.payment.manage.appclient.core.ManageAppService;
+import au.com.royalpay.payment.tools.CommonConsts;
+import au.com.royalpay.payment.tools.device.ManageDeviceSupport;
+import com.alibaba.fastjson.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/api/v1.0/manage/app")
+public class ManageAppController {
+    Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Resource
+    private ManageAppService manageAppService;
+
+        @RequestMapping(value = "/token", method = RequestMethod.PUT)
+    public void updateDevToken(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody JSONObject token) {
+        manageAppService.updateDevToken(device, token.getString("devToken"));
+
+    }
+}
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
index b7bda0c8c..b4f4bf3e5 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
@@ -5,6 +5,7 @@ import au.com.royalpay.payment.manage.appclient.core.RetailAppService;
 import au.com.royalpay.payment.manage.signin.core.SignInStatusManager;
 import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.device.DeviceSupport;
+import au.com.royalpay.payment.tools.device.ManageDeviceSupport;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.http.HttpUtils;
 import au.com.royalpay.payment.tools.locale.LocaleSupport;
@@ -37,6 +38,8 @@ public class RetailValidationController {
     @Resource
     private DeviceSupport deviceSupport;
     @Resource
+    private ManageDeviceSupport manageDeviceSupport;
+    @Resource
     private RetailAppService retailAppService;
 
     @RequestMapping(value = "/devices/{devType}/register", method = RequestMethod.POST)
@@ -46,7 +49,7 @@ public class RetailValidationController {
 
     @RequestMapping(value = "/devices/{devType}/manage/register", method = RequestMethod.POST)
     public JSONObject manageRegister(@RequestBody String registeration, @PathVariable String devType) {
-        return deviceSupport.register(devType, registeration);
+        return manageDeviceSupport.register(devType, registeration);
     }
 
     @RequestMapping(value = "/sign_in_check", method = RequestMethod.POST)

From cff2f0d16d80d039a2a987c1d9e2dbcb5a2a1996 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 8 Mar 2019 18:02:21 +0800
Subject: [PATCH 03/38] add getReferrerList

---
 .../manage/appclient/core/ManageAppService.java      |  4 ++++
 .../appclient/core/impls/ManageAppServiceImp.java    | 12 ++++++++++++
 .../manage/appclient/web/ManageAppController.java    |  7 ++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
index 05e8b1477..c8b001d75 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
@@ -2,8 +2,12 @@ package au.com.royalpay.payment.manage.appclient.core;
 
 import com.alibaba.fastjson.JSONObject;
 
+import java.util.List;
+
 public interface ManageAppService {
 
     void updateDevToken(JSONObject device, String devToken);
 
+    List<JSONObject> getReferrerList(JSONObject device);
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index b3d1372c1..7a1cd2098 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -1,21 +1,33 @@
 package au.com.royalpay.payment.manage.appclient.core.impls;
 
 import au.com.royalpay.payment.manage.appclient.core.ManageAppService;
+import au.com.royalpay.payment.manage.mappers.system.OrgMapper;
 import au.com.royalpay.payment.tools.device.DeviceSupport;
 import au.com.royalpay.payment.tools.device.ManageDeviceSupport;
 import com.alibaba.fastjson.JSONObject;
+import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 public class ManageAppServiceImp implements ManageAppService {
 
     @Resource
     private ManageDeviceSupport manageDeviceSupport;
+    @Resource
+    private OrgMapper orgMapper;
 
     @Override
     public void updateDevToken(JSONObject device, String devToken) {
         manageDeviceSupport.updateDeviceMessageToken(device, devToken);
     }
+
+    @Override
+    public List<JSONObject> getReferrerList(JSONObject device) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        return orgMapper.listOrgs(1,new PageBounds());
+    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
index bd895de5b..f4606143d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @RequestMapping("/api/v1.0/manage/app")
@@ -18,9 +19,13 @@ public class ManageAppController {
     @Resource
     private ManageAppService manageAppService;
 
-        @RequestMapping(value = "/token", method = RequestMethod.PUT)
+    @RequestMapping(value = "/token", method = RequestMethod.PUT)
     public void updateDevToken(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody JSONObject token) {
         manageAppService.updateDevToken(device, token.getString("devToken"));
+    }
 
+    @RequestMapping(value = "/referrer", method = RequestMethod.GET)
+    public List<JSONObject> getReferrerList(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody JSONObject token) {
+       return manageAppService.getReferrerList(device);
     }
 }

From f9b40885618932786646184a45a70874ff7860dd Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 11 Mar 2019 15:19:51 +0800
Subject: [PATCH 04/38] =?UTF-8?q?add=20=E7=99=BB=E5=87=BA=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E3=80=81=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E8=BF=9B=E4=BB=B6=E3=80=81=E5=95=86=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E3=80=81=E5=95=86=E6=88=B7=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appclient/core/ManageAppService.java      | 17 ++++
 .../core/impls/ManageAppServiceImp.java       | 80 +++++++++++++++++++
 .../appclient/web/ManageAppController.java    | 53 +++++++++++-
 .../system/ManageDeviceTokenMapper.java       | 25 ++++++
 .../system/ManageDeviceTokenMapper.xml        |  9 +++
 5 files changed, 182 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.java
 create mode 100644 src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.xml

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
index c8b001d75..8a32cb867 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
@@ -1,5 +1,8 @@
 package au.com.royalpay.payment.manage.appclient.core;
 
+import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
+import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
+import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
 import com.alibaba.fastjson.JSONObject;
 
 import java.util.List;
@@ -8,6 +11,20 @@ public interface ManageAppService {
 
     void updateDevToken(JSONObject device, String devToken);
 
+    void updateDevTokenStatus(String devId, int status);
+
+    JSONObject getDevTokenByDevId(String dev_id);
+
+    void sign_out(JSONObject device);
+
+    void changeAccountPassword(JSONObject device, ChangePwdBean change, String manager_id);
+
     List<JSONObject> getReferrerList(JSONObject device);
 
+    JSONObject registerClient(JSONObject device, ClientRegisterInfo registery);
+
+    List<JSONObject> listPartners(JSONObject device, PartnerQuery query);
+
+    JSONObject clientDetail(JSONObject device, String clientMoniker);
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index 7a1cd2098..db2c72541 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -1,11 +1,22 @@
 package au.com.royalpay.payment.manage.appclient.core.impls;
 
 import au.com.royalpay.payment.manage.appclient.core.ManageAppService;
+import au.com.royalpay.payment.manage.mappers.system.ManageDeviceTokenMapper;
+import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
 import au.com.royalpay.payment.manage.mappers.system.OrgMapper;
+import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
+import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
+import au.com.royalpay.payment.manage.merchants.core.ClientManager;
+import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
+import au.com.royalpay.payment.manage.signin.core.ManagerAccountsService;
+import au.com.royalpay.payment.manage.signin.core.SignInAccountService;
 import au.com.royalpay.payment.tools.device.DeviceSupport;
 import au.com.royalpay.payment.tools.device.ManageDeviceSupport;
+import au.com.royalpay.payment.tools.device.support.DeviceRegister;
+import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -18,16 +29,85 @@ public class ManageAppServiceImp implements ManageAppService {
     private ManageDeviceSupport manageDeviceSupport;
     @Resource
     private OrgMapper orgMapper;
+    @Resource
+    private ManagerMapper managerMapper;
+    @Resource
+    private ClientManager clientManager;
+    @Resource
+    private SignInAccountService signInAccountService;
+    @Resource
+    private ManageDeviceTokenMapper manageDeviceTokenMapper;
+
 
     @Override
     public void updateDevToken(JSONObject device, String devToken) {
         manageDeviceSupport.updateDeviceMessageToken(device, devToken);
     }
 
+    @Override
+    public void sign_out(JSONObject device) {
+        String clientType = device.getString("client_type");
+        DeviceRegister register = manageDeviceSupport.findRegister(clientType);
+        register.manageSignout(device);
+    }
+
+    @Override
+    public void changeAccountPassword(JSONObject device, ChangePwdBean change, String manager_id) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        // JSONObject client = signInAccountService.getClient(account_id);
+        if (!manager_id.equals(device.getString("manager_id"))) {
+            throw new ForbiddenException("You have no permission");
+        }
+        signInAccountService.changeManagerPassword(device, change);
+        updateDevTokenStatus(device.getString("dev_id"), 0);
+    }
+
     @Override
     public List<JSONObject> getReferrerList(JSONObject device) {
         String clientType = device.getString("client_type");
         manageDeviceSupport.findRegister(clientType);
         return orgMapper.listOrgs(1,new PageBounds());
     }
+
+    @Override
+    public JSONObject registerClient(JSONObject device, ClientRegisterInfo registery) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        return clientManager.registerClient(null, registery, manager);
+    }
+
+    @Override
+    public List<JSONObject> listPartners(JSONObject device, PartnerQuery query) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        return clientManager.listPartners( manager, query);
+    }
+
+    @Override
+    public JSONObject clientDetail(JSONObject device, String clientMoniker) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        return clientManager.clientDetail(manager, clientMoniker);
+    }
+
+    @Override
+    public void updateDevTokenStatus(String devId, int status) {
+        JSONObject devTokenObj = getDevTokenByDevId(devId);
+        if (devTokenObj != null) {
+            devTokenObj.put("is_valid", status);
+            manageDeviceTokenMapper.update(devTokenObj);
+        }
+    }
+
+    @Override
+    @Cacheable(value = ":dev_message_token:", key = "#dev_id")
+    public JSONObject getDevTokenByDevId(String dev_id) {
+        return manageDeviceTokenMapper.findByDevId(dev_id);
+    }
+
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
index f4606143d..350644e4a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -1,16 +1,26 @@
 package au.com.royalpay.payment.manage.appclient.web;
 
 import au.com.royalpay.payment.manage.appclient.core.ManageAppService;
+import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
+import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
+import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
+import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
 import au.com.royalpay.payment.tools.CommonConsts;
-import au.com.royalpay.payment.tools.device.ManageDeviceSupport;
+import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient;
+import au.com.royalpay.payment.tools.http.HttpUtils;
+import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
 import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.List;
 
+
 @RestController
 @RequestMapping("/api/v1.0/manage/app")
 public class ManageAppController {
@@ -18,14 +28,53 @@ public class ManageAppController {
 
     @Resource
     private ManageAppService manageAppService;
+    @Resource
+    private AttachmentClient attachmentClient;
 
     @RequestMapping(value = "/token", method = RequestMethod.PUT)
     public void updateDevToken(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody JSONObject token) {
         manageAppService.updateDevToken(device, token.getString("devToken"));
     }
 
+    @RequestMapping(value = "/sign_out", method = RequestMethod.PUT)
+    public void signOut(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        manageAppService.sign_out(device);
+    }
+
+    @RequestMapping(value = "/manager_password/{manager_id}", method = RequestMethod.PUT)
+    public void changePassword(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @PathVariable String manager_id,
+                               @RequestBody @Valid ChangePwdBean change, Errors errors) {
+        HttpUtils.handleValidErrors(errors);
+        manageAppService.changeAccountPassword(device, change, manager_id);
+    }
+
     @RequestMapping(value = "/referrer", method = RequestMethod.GET)
     public List<JSONObject> getReferrerList(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody JSONObject token) {
-       return manageAppService.getReferrerList(device);
+        return manageAppService.getReferrerList(device);
+    }
+
+    @RequestMapping(value = "/attachment/files", method = RequestMethod.POST)
+    public JSONObject uploadImage(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestParam MultipartFile file) throws Exception {
+        return attachmentClient.uploadFile(file, false);
     }
+
+    @RequestMapping(value = "/merchant/register", method = RequestMethod.POST)
+    public JSONObject registerPartner(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody @Valid ClientRegisterInfo registery,
+                                      Errors errors){
+        HttpUtils.handleValidErrors(errors);
+        return manageAppService.registerClient(device, registery);
+    }
+
+    @RequestMapping(value = "/merchants", method = RequestMethod.GET)
+    public List<JSONObject> listPartners(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, PartnerQuery query) {
+        return manageAppService.listPartners(device, query);
+    }
+
+    @RequestMapping(value = "/merchant/{clientMoniker}/detail", method = RequestMethod.GET)
+    public JSONObject getClientByMoniker(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        return manageAppService.clientDetail(device, clientMoniker);
+    }
+
+
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.java
new file mode 100644
index 000000000..7a758ad85
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.java
@@ -0,0 +1,25 @@
+package au.com.royalpay.payment.manage.mappers.system;
+
+import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * Created by yixian on 2016-09-12.
+ */
+@AutoMapper(tablename = "sys_manage_devices_token", pkName = "dev_token_id")
+public interface ManageDeviceTokenMapper {
+
+    JSONObject findByDevId(@Param("dev_id") String devDevId);
+
+    @AutoSql(type = SqlType.UPDATE)
+    void update(JSONObject devInfo);
+
+    @AutoSql(type = SqlType.INSERT)
+    void save(JSONObject devTokenInfo);
+
+}
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.xml
new file mode 100644
index 000000000..df785f3e7
--- /dev/null
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManageDeviceTokenMapper.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="au.com.royalpay.payment.manage.mappers.system.ManageDeviceTokenMapper">
+
+    <select id="findByDevId" resultType="com.alibaba.fastjson.JSONObject">
+         SELECT * FROM sys_manage_devices_token where dev_id=#{dev_id} limit 1
+    </select>
+</mapper>
\ No newline at end of file

From b84e75478f97c31c7d28e2507f3f5f3dc7d68f3a Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 11 Mar 2019 16:08:19 +0800
Subject: [PATCH 05/38] fix redis key

---
 .../manage/appclient/core/impls/ManageAppServiceImp.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index db2c72541..a7e236816 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -83,7 +83,7 @@ public class ManageAppServiceImp implements ManageAppService {
         String clientType = device.getString("client_type");
         manageDeviceSupport.findRegister(clientType);
         JSONObject manager = managerMapper.findById(device.getString("manager_id"));
-        return clientManager.listPartners( manager, query);
+        return clientManager.listPartners(manager, query);
     }
 
     @Override
@@ -104,7 +104,7 @@ public class ManageAppServiceImp implements ManageAppService {
     }
 
     @Override
-    @Cacheable(value = ":dev_message_token:", key = "#dev_id")
+    @Cacheable(value = ":manage_dev_message_token:", key = "#dev_id")
     public JSONObject getDevTokenByDevId(String dev_id) {
         return manageDeviceTokenMapper.findByDevId(dev_id);
     }

From 7733d8b59d786e78d35079db58586518e5053332 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 11 Mar 2019 17:02:52 +0800
Subject: [PATCH 06/38] commit get version

---
 .../appclient/core/ManageAppService.java      |  2 ++
 .../core/impls/ManageAppServiceImp.java       | 31 +++++++++++++++++++
 .../appclient/web/ManageAppController.java    |  5 +++
 .../templates/org_commission_info.html        |  1 -
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
index 8a32cb867..b3da8834b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
@@ -27,4 +27,6 @@ public interface ManageAppService {
 
     JSONObject clientDetail(JSONObject device, String clientMoniker);
 
+    JSONObject getNewVersion(JSONObject device);
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index a7e236816..9eefe8d1c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -13,6 +13,7 @@ import au.com.royalpay.payment.manage.signin.core.SignInAccountService;
 import au.com.royalpay.payment.tools.device.DeviceSupport;
 import au.com.royalpay.payment.tools.device.ManageDeviceSupport;
 import au.com.royalpay.payment.tools.device.support.DeviceRegister;
+import au.com.royalpay.payment.tools.env.PlatformEnvironment;
 import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
@@ -109,5 +110,35 @@ public class ManageAppServiceImp implements ManageAppService {
         return manageDeviceTokenMapper.findByDevId(dev_id);
     }
 
+    @Override
+    public JSONObject getNewVersion(JSONObject device) {
+        String version = device.getString("version");
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        String newAppVersion = PlatformEnvironment.getEnv().getNewVersion(clientType);
+        Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate(clientType);
+        String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent(clientType);
+        int update_type = 0;// 0:不更新 1：更新 2：强制更新
+        String[] oldVersion = version.split("\\.");
+        String[] newVersion = newAppVersion.split("\\.");
+        JSONObject res = new JSONObject();
+        res.put("update_content", updateContent);
+        for (int i = 0; i < newVersion.length; i++) {
+            if (Integer.valueOf(newVersion[i]) > Integer.valueOf(oldVersion[i])) {
+                update_type = 1;
+                if (isUpdate) {
+                    update_type = 2;
+                }
+                res.put("update_type", update_type);
+                return res;
+            } else if (Integer.valueOf(newVersion[i]) < Integer.valueOf(oldVersion[i])) {
+                res.put("update_type", update_type);
+                return res;
+            }
+        }
+        res.put("update_type", update_type);
+        return res;
+    }
+
 
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
index 350644e4a..b3166184d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -75,6 +75,11 @@ public class ManageAppController {
         return manageAppService.clientDetail(device, clientMoniker);
     }
 
+    @RequestMapping(value = "/version", method = RequestMethod.GET)
+    public JSONObject getAppVersion(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        return manageAppService.getNewVersion(device);
+    }
+
 
 
 }
diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_info.html b/src/main/ui/static/config/orgcommission/templates/org_commission_info.html
index 166c0790b..2370ed76b 100644
--- a/src/main/ui/static/config/orgcommission/templates/org_commission_info.html
+++ b/src/main/ui/static/config/orgcommission/templates/org_commission_info.html
@@ -24,7 +24,6 @@
                 </ul>
                 <h4>补充说明</h4>
                 <ul style="color:red">
-                    <li >退款成功的订单不计入合伙人提成内</li>
                     <li>当本月有合伙人手续费存在欠款时，无法下载汇款文件</li>
                 </ul>
             </div>

From 4b7dbaaaab90e56a6fda722175c6f6883b7ead1a Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 12 Mar 2019 15:44:56 +0800
Subject: [PATCH 07/38] commit commons

---
 .../appclient/core/ManageAppService.java      |  4 +
 .../core/impls/ManageAppServiceImp.java       | 84 +++++++++++++++++++
 .../appclient/web/ManageAppController.java    | 11 +++
 .../FinancialPartnerCommissionMapper.java     |  2 +
 .../manage/mappers/system/ClientMapper.java   |  3 +
 .../manage/merchants/core/ClientManager.java  |  1 +
 .../FinancialPartnerCommissionMapper.xml      |  8 ++
 .../manage/mappers/system/ClientMapper.xml    | 11 +++
 8 files changed, 124 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
index b3da8834b..acdbe48d8 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
@@ -23,10 +23,14 @@ public interface ManageAppService {
 
     JSONObject registerClient(JSONObject device, ClientRegisterInfo registery);
 
+    void updateClientRegisterInfo(JSONObject device, String clientMoniker, ClientRegisterInfo info);
+
     List<JSONObject> listPartners(JSONObject device, PartnerQuery query);
 
     JSONObject clientDetail(JSONObject device, String clientMoniker);
 
     JSONObject getNewVersion(JSONObject device);
 
+    JSONObject getCommons(JSONObject device);
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index 9eefe8d1c..f4f21a3cd 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -1,6 +1,10 @@
 package au.com.royalpay.payment.manage.appclient.core.impls;
 
 import au.com.royalpay.payment.manage.appclient.core.ManageAppService;
+import au.com.royalpay.payment.manage.mappers.financial.FinancialBDPrizeLogMapper;
+import au.com.royalpay.payment.manage.mappers.financial.FinancialBDPrizeRecordMapper;
+import au.com.royalpay.payment.manage.mappers.financial.FinancialPartnerCommissionMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
 import au.com.royalpay.payment.manage.mappers.system.ManageDeviceTokenMapper;
 import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
 import au.com.royalpay.payment.manage.mappers.system.OrgMapper;
@@ -17,10 +21,14 @@ import au.com.royalpay.payment.tools.env.PlatformEnvironment;
 import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -35,9 +43,17 @@ public class ManageAppServiceImp implements ManageAppService {
     @Resource
     private ClientManager clientManager;
     @Resource
+    private ClientMapper clientMapper;
+    @Resource
     private SignInAccountService signInAccountService;
     @Resource
     private ManageDeviceTokenMapper manageDeviceTokenMapper;
+    @Resource
+    private FinancialBDPrizeRecordMapper financialBDPrizeRecordMapper;
+    @Resource
+    private FinancialBDPrizeLogMapper financialBDPrizeLogMapper;
+    @Resource
+    private FinancialPartnerCommissionMapper financialPartnerCommissionMapper;
 
 
     @Override
@@ -79,6 +95,14 @@ public class ManageAppServiceImp implements ManageAppService {
         return clientManager.registerClient(null, registery, manager);
     }
 
+    @Override
+    public void updateClientRegisterInfo(JSONObject device, String clientMoniker, ClientRegisterInfo info) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        clientManager.updateClientRegisterInfo(manager, clientMoniker, info);
+    }
+
     @Override
     public List<JSONObject> listPartners(JSONObject device, PartnerQuery query) {
         String clientType = device.getString("client_type");
@@ -140,5 +164,65 @@ public class ManageAppServiceImp implements ManageAppService {
         return res;
     }
 
+    @Override
+    public JSONObject getCommons(JSONObject device) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        JSONObject countBdClients = clientMapper.countBdApproveClients(manager.getString("manager_id"));
+
+        if (countBdClients == null) {
+            countBdClients = new JSONObject();
+            countBdClients.put("approving", 0);
+            countBdClients.put("pass", 0);
+            countBdClients.put("this_months_pass", 0);
+        }
+        JSONObject result;
+
+        switch (manager.getIntValue("org_id")) {
+            case 1:
+                result = bdCommons(manager);
+                break;
+            default:
+                result = orgCommons(manager);
+                break;
+        }
+        result.putAll(countBdClients);
+        return result;
+    }
 
+    private JSONObject bdCommons(JSONObject manager) {
+        Calendar monthCal = Calendar.getInstance();
+        monthCal.setTime(new Date());
+        monthCal.set(Calendar.MONTH, (monthCal.get(Calendar.MONTH) - 1));
+        Date date = monthCal.getTime();
+        JSONObject totalDetail = new JSONObject();
+        totalDetail.put("date", DateFormatUtils.format(date, "yyyy-MM"));
+        totalDetail.put("total_amount", BigDecimal.ZERO);
+        totalDetail.put("total_prize", BigDecimal.ZERO);
+        totalDetail.put("total_donation", BigDecimal.ZERO);
+        totalDetail.put("send_prize", BigDecimal.ZERO);
+        totalDetail.put("hold_prize", BigDecimal.ZERO);
+        totalDetail.put("last_punish", BigDecimal.ZERO);
+
+        JSONObject report = financialBDPrizeRecordMapper.getReport(DateFormatUtils.format(date, "yyyy-MM"));
+        if (report != null) {
+             totalDetail.putAll(financialBDPrizeLogMapper.findByReportAndBDTotal(report.getString("record_id"), manager.getString("manager_id")));
+        }
+        return totalDetail;
+    }
+
+    private JSONObject orgCommons(JSONObject manager) {
+        Calendar monthCal = Calendar.getInstance();
+        monthCal.setTime(new Date());
+        monthCal.set(Calendar.MONTH, (monthCal.get(Calendar.MONTH) - 1));
+        JSONObject total = financialPartnerCommissionMapper.findTotalByOrg(monthCal.get(Calendar.YEAR), monthCal.get(Calendar.MONTH)+1, manager.getString("org_id"));
+        if (total == null) {
+            total = new JSONObject();
+            total.put("total_amount", BigDecimal.ZERO);
+            total.put("org_prize", BigDecimal.ZERO);
+        }
+        total.put("date", DateFormatUtils.format(monthCal.getTime(), "yyyy-MM"));
+        return total;
+    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
index b3166184d..28daa8408 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -65,6 +65,12 @@ public class ManageAppController {
         return manageAppService.registerClient(device, registery);
     }
 
+    @RequestMapping(value = "/merchant/{clientMoniker}/update", method = RequestMethod.PUT)
+    public void updatePartnerInfo(@PathVariable String clientMoniker, @RequestBody ClientRegisterInfo info,
+                                  @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        manageAppService.updateClientRegisterInfo(device, clientMoniker, info);
+    }
+
     @RequestMapping(value = "/merchants", method = RequestMethod.GET)
     public List<JSONObject> listPartners(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, PartnerQuery query) {
         return manageAppService.listPartners(device, query);
@@ -80,6 +86,11 @@ public class ManageAppController {
         return manageAppService.getNewVersion(device);
     }
 
+    @RequestMapping(value = "/commons", method = RequestMethod.GET)
+    public JSONObject getCommons(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        return manageAppService.getCommons(device);
+    }
+
 
 
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java
index 2004bb911..350e37486 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java
@@ -44,4 +44,6 @@ public interface FinancialPartnerCommissionMapper {
 
     PageList<JSONObject> getClientExtractRecord(@Param("org_id") int orgId, PageBounds pageBounds);
 
+    JSONObject findTotalByOrg(@Param("year") int year, @Param("month") int month, @Param("org_id") String orgId);
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
index 4e48045ce..63e40acb3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
@@ -110,4 +110,7 @@ public interface ClientMapper {
 
     List<JSONObject> findByrpayNotNull();
 
+    JSONObject countBdApproveClients(@Param("manager_id") String manager_id);
+
+
 }
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 76e4bf096..259370b90 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
@@ -16,6 +16,7 @@ import au.com.royalpay.payment.tools.merchants.beans.UpdateSurchargeDTO;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
index fbb3c3829..fcbe3278b 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
@@ -81,4 +81,12 @@
         ORDER BY c.year DESC,c.month DESC
     </select>
 
+    <select id="findTotalByOrg" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+        SUM(gross_amount) total_amount,
+        SUM(org_charge) org_prize
+        FROM financial_partner_commission
+        WHERE org_id=#{org_id} AND year=#{year} AND month=#{month}
+    </select>
+
 </mapper>
\ No newline at end of file
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 f4e4a3aa8..520101f71 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
@@ -444,4 +444,15 @@
     <select id="findByrpayNotNull" resultType="com.alibaba.fastjson.JSONObject">
         select * FROM sys_clients WHERE rpay_enterprise_id != ''
     </select>
+
+    <select id="countBdApproveClients" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT SUM(IF(((approve_result=4 AND open_status IS NULL) OR (approve_result=3 AND open_status IS NULL) OR
+                open_status=1 OR open_status=2 OR open_status=4),1,0)) approving,
+			   SUM(IF((open_status = 5 AND approve_result = 1 AND approve_time IS NOT NULL),1,0)) pass,
+			   SUM(IF((YEAR(approve_time)=YEAR(now()) and MONTH(approve_time)=MONTH(now()) AND approve_result = 1 AND open_status = 5),1,0)) this_months_pass
+		FROM sys_clients
+        WHERE
+        <bind name="manager_id_pattern" value="'%'+manager_id+'%'"/>
+        bd_user LIKE #{manager_id_pattern} AND is_valid=1;
+    </select>
 </mapper>
\ No newline at end of file

From cc46f27ee01dd48a7e1c9baac5f792acfa168a1e Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 13 Mar 2019 18:25:59 +0800
Subject: [PATCH 08/38] =?UTF-8?q?add=20org=20prize=20&&=20bd=20kpi?=
 =?UTF-8?q?=E3=80=81rates?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appclient/core/ManageAppService.java      |  6 ++++
 .../core/impls/ManageAppServiceImp.java       | 31 +++++++++++++++++++
 .../appclient/web/ManageAppController.java    | 19 ++++++++++--
 .../financial/FinancialBDConfigMapper.java    |  2 ++
 .../FinancialPartnerCommissionMapper.java     |  2 ++
 .../financial/FinancialBDConfigMapper.xml     | 18 +++++++++++
 .../FinancialPartnerCommissionMapper.xml      |  6 ++++
 7 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
index acdbe48d8..bcb07f1d4 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
@@ -33,4 +33,10 @@ public interface ManageAppService {
 
     JSONObject getCommons(JSONObject device);
 
+    List<JSONObject> getOrgPrizeList(JSONObject device);
+
+    List<JSONObject> getBdConfigRates(JSONObject device);
+
+    JSONObject getBdConfigKpi(JSONObject device);
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index f4f21a3cd..4fc8f2730 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -1,6 +1,8 @@
 package au.com.royalpay.payment.manage.appclient.core.impls;
 
 import au.com.royalpay.payment.manage.appclient.core.ManageAppService;
+import au.com.royalpay.payment.manage.bdprize.core.BDPrizeService;
+import au.com.royalpay.payment.manage.mappers.financial.FinancialBDConfigMapper;
 import au.com.royalpay.payment.manage.mappers.financial.FinancialBDPrizeLogMapper;
 import au.com.royalpay.payment.manage.mappers.financial.FinancialBDPrizeRecordMapper;
 import au.com.royalpay.payment.manage.mappers.financial.FinancialPartnerCommissionMapper;
@@ -22,6 +24,7 @@ import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
@@ -54,6 +57,10 @@ public class ManageAppServiceImp implements ManageAppService {
     private FinancialBDPrizeLogMapper financialBDPrizeLogMapper;
     @Resource
     private FinancialPartnerCommissionMapper financialPartnerCommissionMapper;
+    @Resource
+    private BDPrizeService bdPrizeService;
+    @Resource
+    private FinancialBDConfigMapper financialBDConfigMapper;
 
 
     @Override
@@ -225,4 +232,28 @@ public class ManageAppServiceImp implements ManageAppService {
         total.put("date", DateFormatUtils.format(monthCal.getTime(), "yyyy-MM"));
         return total;
     }
+
+    @Override
+    public List<JSONObject> getOrgPrizeList(JSONObject device) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        List<JSONObject> getOrgPrizeList = financialPartnerCommissionMapper.getOrgPrizeList(manager.getString("org_id"));
+        return getOrgPrizeList;
+    }
+
+    @Override
+    public List<JSONObject> getBdConfigRates(JSONObject device) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        return bdPrizeService.getRateConfig();
+    }
+
+    @Override
+    public JSONObject getBdConfigKpi(JSONObject device) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        return financialBDConfigMapper.getBDConfigById(manager.getString("manager_id"));
+    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
index 28daa8408..433d4098b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -7,6 +7,7 @@ import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
 import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
 import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient;
+import au.com.royalpay.payment.tools.device.manageadvise.AppClientController;
 import au.com.royalpay.payment.tools.http.HttpUtils;
 import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
 import com.alibaba.fastjson.JSONObject;
@@ -21,7 +22,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 
-@RestController
+@AppClientController
 @RequestMapping("/api/v1.0/manage/app")
 public class ManageAppController {
     Logger logger = LoggerFactory.getLogger(getClass());
@@ -49,7 +50,7 @@ public class ManageAppController {
     }
 
     @RequestMapping(value = "/referrer", method = RequestMethod.GET)
-    public List<JSONObject> getReferrerList(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody JSONObject token) {
+    public List<JSONObject> getReferrerList(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
         return manageAppService.getReferrerList(device);
     }
 
@@ -60,7 +61,7 @@ public class ManageAppController {
 
     @RequestMapping(value = "/merchant/register", method = RequestMethod.POST)
     public JSONObject registerPartner(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @RequestBody @Valid ClientRegisterInfo registery,
-                                      Errors errors){
+                                      Errors errors) {
         HttpUtils.handleValidErrors(errors);
         return manageAppService.registerClient(device, registery);
     }
@@ -91,6 +92,18 @@ public class ManageAppController {
         return manageAppService.getCommons(device);
     }
 
+    @RequestMapping(value = "/org_prize/list", method = RequestMethod.GET)
+    public List<JSONObject> getOrgPrizeList(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        return manageAppService.getOrgPrizeList(device);
+    }
 
+    @RequestMapping(value = "/bd/rates", method = RequestMethod.GET)
+    public List<JSONObject> getBdConfigRates(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        return manageAppService.getBdConfigRates(device);
+    }
 
+    @RequestMapping(value = "/bd/kpi", method = RequestMethod.GET)
+    public JSONObject getBdConfigKpi(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        return manageAppService.getBdConfigKpi(device);
+    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.java
index ff541b62a..8b4c76832 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.java
@@ -26,6 +26,8 @@ public interface FinancialBDConfigMapper {
 
     List<JSONObject> listBDConfig();
 
+    JSONObject getBDConfigById(@Param("manager_id") String manager_id);
+
     List<JSONObject> listGroupBds(@Param("bd_group") String bd_group);
 
     BigDecimal getGroupAmount(@Param("bd_group") String bd_group, @Param("record_id") String record_id, @Param("channel") String channel);
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java
index 350e37486..a912023a3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java
@@ -24,6 +24,8 @@ public interface FinancialPartnerCommissionMapper {
     @AutoSql(type = SqlType.UPDATE)
     void update(JSONObject commission);
 
+    List<JSONObject> getOrgPrizeList(@Param("org_id") String orgId);
+
     List<Integer> listAvailableMonths(@Param("year") int year);
 
     List<JSONObject> listWithOrgInfo(@Param("year") int year, @Param("month") int month);
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.xml
index 563654312..f403c4064 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.xml
@@ -18,6 +18,24 @@
         ]]>
     </select>
 
+    <select id="getBDConfigById" resultType="com.alibaba.fastjson.JSONObject">
+        <![CDATA[
+        SELECT
+            m.manager_id,
+            m.display_name,
+            c.bd_level,
+            c.city,
+            c.get_prize,
+            c.bd_group,
+            c.kpi_amount,
+            m.is_valid
+        FROM sys_managers m
+            LEFT JOIN financial_bd_config c ON c.manager_id = m.manager_id
+        WHERE m.role & 4 > 0 AND (m.org_id = 1 OR m.org_id IS NULL)
+        AND m.manager_id=#{manager_id}
+        ]]>
+    </select>
+
     <select id="listGroupBds" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT c.*
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
index fcbe3278b..50b3bf110 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="au.com.royalpay.payment.manage.mappers.financial.FinancialPartnerCommissionMapper">
+    <select id="getOrgPrizeList" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT *
+        FROM financial_partner_commission
+        WHERE org_id = #{org_id}
+        ORDER BY `year` DESC,`month` DESC
+    </select>
     <select id="listAvailableMonths" resultType="java.lang.Integer">
         SELECT DISTINCT `month`
         FROM financial_partner_commission

From 691097fd17900d34fc13c789b5bb922f3da6ec92 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 14 Mar 2019 17:49:27 +0800
Subject: [PATCH 09/38] =?UTF-8?q?add=20App=E9=93=B6=E8=A1=8C=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appclient/beans/AppMerchantBean.java      | 480 ++++++++++++++++++
 .../appclient/core/ManageAppService.java      |  11 +-
 .../core/impls/ManageAppServiceImp.java       |  57 ++-
 .../appclient/web/ManageAppController.java    |  32 +-
 .../FinancialPartnerCommissionMapper.java     |   3 +
 .../manage/mappers/system/ClientMapper.java   |   2 +
 .../manage/merchants/core/ClientManager.java  |   3 +
 .../core/impls/ClientManagerImpl.java         |  64 +++
 .../FinancialPartnerCommissionMapper.xml      |   9 +
 .../manage/mappers/system/ClientMapper.xml    |  79 +++
 10 files changed, 728 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppMerchantBean.java

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppMerchantBean.java b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppMerchantBean.java
new file mode 100644
index 000000000..6f7dda5d6
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppMerchantBean.java
@@ -0,0 +1,480 @@
+package au.com.royalpay.payment.manage.appclient.beans;
+
+import au.com.royalpay.payment.core.exceptions.ParamInvalidException;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+public class AppMerchantBean {
+    private final DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+    private String textType;
+    private String searchText;
+    private String client_moniker;
+    private String state;
+    private String suburb;
+    private String short_name;
+    private String sub_merchant_id;
+    private String org_id;
+    private String org_ids;
+    private String bd;
+    private String business_structure;
+    private String industry;
+    private Integer clean_day;
+    private String bd_city;
+    private String surcharge_start_rate;
+    private String surcharge_end_rate;
+    private String create_start_time;
+    private String approve_start_time;
+    private String create_end_time;
+    private String approve_end_time;
+    private String transaction_start_time;
+    private String transaction_end_time;
+    private boolean approving = false;
+    private int page = 1;
+    private int limit = 10;
+    private boolean onlyMe = false;
+    private boolean tempMchId = false;
+    private boolean quickPass = false;
+    private boolean greenChannel = false;
+    private boolean greenChannelBdTodo = false;
+    private boolean pass = false;
+    private boolean completed_contract = false;
+    private boolean apply_to_back = false;
+    private boolean bd_upload_material = false;
+    private boolean is_valid = false;
+    private String merchant_id;
+    private int status;
+
+    public String getClient_moniker() {
+        return StringUtils.isEmpty(client_moniker) ? null : client_moniker;
+    }
+
+    public void setClient_moniker(String client_moniker) {
+        this.client_moniker = client_moniker;
+    }
+
+    public String getShort_name() {
+        return short_name;
+    }
+
+    public void setShort_name(String short_name) {
+        this.short_name = short_name;
+    }
+
+    public String getSub_merchant_id() {
+        return sub_merchant_id;
+    }
+
+    public void setSub_merchant_id(String sub_merchant_id) {
+        this.sub_merchant_id = sub_merchant_id;
+    }
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    public int getLimit() {
+        return limit;
+    }
+
+    public void setLimit(int limit) {
+        this.limit = limit;
+    }
+
+    public JSONObject toJsonParam() {
+        JSONObject param = new JSONObject();
+        if (StringUtils.isNotBlank(client_moniker)) {
+            param.put("client_moniker", getClient_moniker());
+        }
+        if (StringUtils.isNotBlank(short_name)) {
+            param.put("short_name", short_name);
+        }
+        if (StringUtils.isNotBlank(sub_merchant_id)) {
+            param.put("sub_merchant_id", sub_merchant_id);
+        }
+        if (StringUtils.isNotBlank(state)) {
+            param.put("state", state);
+        }
+        if (StringUtils.isNotBlank(suburb)) {
+            param.put("suburb", suburb);
+        }
+        if (StringUtils.isNotBlank(searchText)) {
+            param.put("search_text", searchText);
+            if (StringUtils.isNotBlank(textType)) {
+                param.put("text_type", textType);
+            } else {
+                param.put("text_type", "all");
+            }
+        }
+        if (approving) {
+            param.put("approving", true);
+        }
+        if (org_id != null) {
+            param.put("org_id", org_id);
+        }
+        if (org_ids != null) {
+            param.put("org_ids", org_ids);
+        }
+        if (StringUtils.isNotBlank(bd)) {
+            param.put("bd_user", bd);
+        }
+        if (quickPass){
+            param.put("quickPass",true);
+        }
+        if (greenChannel){
+            param.put("greenChannel",true);
+        }
+        if (business_structure!=null && !business_structure.equals("")){
+            param.put("business_structure",business_structure);
+        }
+        if (industry!=null && !industry.equals("")){
+            param.put("industry",industry);
+        }
+        if (bd_city!=null && !bd_city.equals("")){
+            param.put("bd_city",bd_city);
+        }
+        if (clean_day!=null){
+            param.put("clean_day",clean_day);
+        }
+        if (surcharge_start_rate!=null) {
+            param.put("surcharge_start_rate",surcharge_start_rate);
+        }
+        if (surcharge_end_rate!=null){
+            param.put("surcharge_end_rate",surcharge_end_rate);
+        }
+        if (transaction_start_time != null) {
+            try {
+                param.put("transaction_start_time", format.parse(transaction_start_time));
+            } catch (ParseException e) {
+                throw new ParamInvalidException("transaction_start_time", "error.payment.valid.invalid_date_format");
+            }
+        }
+        if (transaction_end_time != null) {
+            try {
+                param.put("transaction_end_time", DateUtils.addDays(format.parse(transaction_end_time), 1));
+            } catch (ParseException e) {
+                throw new ParamInvalidException("transaction_end_time", "error.payment.valid.invalid_date_format");
+            }
+        }
+        if (create_start_time != null) {
+            try {
+                param.put("create_start_time", format.parse(create_start_time));
+            } catch (ParseException e) {
+                throw new ParamInvalidException("create_start_time", "error.payment.valid.invalid_date_format");
+            }
+        }
+        if (create_end_time != null) {
+            try {
+                param.put("create_end_time", DateUtils.addDays(format.parse(create_end_time), 1));
+            } catch (ParseException e) {
+                throw new ParamInvalidException("create_end_time", "error.payment.valid.invalid_date_format");
+            }
+        }
+        if (approve_start_time != null) {
+            try {
+                param.put("approve_start_time", format.parse(approve_start_time));
+            } catch (ParseException e) {
+                throw new ParamInvalidException("approve_start_time", "error.payment.valid.invalid_date_format");
+            }
+        }
+        if (approve_end_time != null) {
+            try {
+                param.put("approve_end_time", DateUtils.addDays(format.parse(approve_end_time), 1));
+            } catch (ParseException e) {
+                throw new ParamInvalidException("approve_end_time", "error.payment.valid.invalid_date_format");
+            }
+        }
+        if (greenChannelBdTodo){
+            param.put("greenChannelBdTodo",true);
+        }
+        if (is_valid){
+            param.put("is_valid",true);
+        }
+        if (pass){
+            param.put("pass",true);
+        }
+        if (completed_contract){
+            param.put("completed_contract",true);
+        }
+        if (apply_to_back){
+            param.put("apply_to_back",true);
+        }
+        if (bd_upload_material){
+            param.put("bd_upload_material",true);
+        }
+        if (merchant_id != null){
+            param.put("merchant_id",merchant_id);
+        }
+        return param;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getTextType() {
+        return textType;
+    }
+
+    public void setTextType(String textType) {
+        this.textType = textType;
+    }
+
+    public String getSearchText() {
+        return searchText;
+    }
+
+    public void setSearchText(String searchText) {
+        this.searchText = searchText;
+    }
+
+    public String getOrg_id() {
+        return org_id;
+    }
+
+    public void setOrg_id(String org_id) {
+        this.org_id = org_id;
+    }
+
+    public void setOnlyMe(boolean onlyMe) {
+        this.onlyMe = onlyMe;
+    }
+
+    public boolean getOnlyMe() {
+        return onlyMe;
+    }
+
+    public boolean isTempMchId() {
+        return tempMchId;
+    }
+
+    public void setTempMchId(boolean tempMchId) {
+        this.tempMchId = tempMchId;
+    }
+
+    public String getBusiness_structure() {
+        return business_structure;
+    }
+
+    public void setBusiness_structure(String business_structure) {
+        this.business_structure = business_structure;
+    }
+
+    public String getIndustry() {
+        return industry;
+    }
+
+    public void setIndustry(String industry) {
+        this.industry = industry;
+    }
+
+    public Integer getClean_day() {
+        return clean_day;
+    }
+
+    public void setClean_day(Integer clean_day) {
+        this.clean_day = clean_day;
+    }
+
+    public String getBd_city() {
+        return bd_city;
+    }
+
+    public void setBd_city(String bd_city) {
+        this.bd_city = bd_city;
+    }
+
+    public String getCreate_start_time() {
+        return create_start_time;
+    }
+
+    public void setCreate_start_time(String create_start_time) {
+        this.create_start_time = create_start_time;
+    }
+
+    public String getApprove_start_time() {
+        return approve_start_time;
+    }
+
+    public void setApprove_start_time(String approve_start_time) {
+        this.approve_start_time = approve_start_time;
+    }
+
+    public String getCreate_end_time() {
+        return create_end_time;
+    }
+
+    public void setCreate_end_time(String create_end_time) {
+        this.create_end_time = create_end_time;
+    }
+
+    public String getApprove_end_time() {
+        return approve_end_time;
+    }
+
+    public void setApprove_end_time(String approve_end_time) {
+        this.approve_end_time = approve_end_time;
+    }
+
+    public String getSurcharge_start_rate() {
+        return surcharge_start_rate;
+    }
+
+    public void setSurcharge_start_rate(String surcharge_start_rate) {
+        this.surcharge_start_rate = surcharge_start_rate;
+    }
+
+    public String getTransaction_start_time() {
+        return transaction_start_time;
+    }
+
+    public void setTransaction_start_time(String transaction_start_time) {
+        this.transaction_start_time = transaction_start_time;
+    }
+
+    public String getTransaction_end_time() {
+        return transaction_end_time;
+    }
+
+    public void setTransaction_end_time(String transaction_end_time) {
+        this.transaction_end_time = transaction_end_time;
+    }
+
+    public String getSurcharge_end_rate() {
+        return surcharge_end_rate;
+    }
+
+    public void setSurcharge_end_rate(String surcharge_end_rate) {
+        this.surcharge_end_rate = surcharge_end_rate;
+    }
+
+    public boolean isOnlyMe() {
+        return onlyMe;
+    }
+
+    public boolean isApproving() {
+        return approving;
+    }
+
+    public void setApproving(boolean approving) {
+        this.approving = approving;
+    }
+
+    public boolean isQuickPass() {
+        return quickPass;
+    }
+
+    public void setQuickPass(boolean quickPass) {
+        this.quickPass = quickPass;
+    }
+
+    public boolean isGreenChannel() {
+        return greenChannel;
+    }
+
+    public void setGreenChannel(boolean greenChannel) {
+        this.greenChannel = greenChannel;
+    }
+    public void setGreenChannelAndBDtodo(boolean bDTodo){
+        this.greenChannelBdTodo = bDTodo;
+    }
+    public void setIs_valid(boolean is_valid){
+        this.is_valid=is_valid;
+    }
+
+    public DateFormat getFormat() {
+        return format;
+    }
+
+    public boolean isGreenChannelBdTodo() {
+        return greenChannelBdTodo;
+    }
+
+    public void setGreenChannelBdTodo(boolean greenChannelBdTodo) {
+        this.greenChannelBdTodo = greenChannelBdTodo;
+    }
+
+    public boolean isPass() {
+        return pass;
+    }
+
+    public void setPass(boolean pass) {
+        this.pass = pass;
+    }
+
+    public boolean isCompleted_contract() {
+        return completed_contract;
+    }
+
+    public void setCompleted_contract(boolean completed_contract) {
+        this.completed_contract = completed_contract;
+    }
+
+    public boolean isApply_to_back() {
+        return apply_to_back;
+    }
+
+    public void setApply_to_back(boolean apply_to_back) {
+        this.apply_to_back = apply_to_back;
+    }
+
+    public boolean isBd_upload_material() {
+        return bd_upload_material;
+    }
+
+    public void setBd_upload_material(boolean bd_upload_material) {
+        this.bd_upload_material = bd_upload_material;
+    }
+
+    public boolean isIs_valid() {
+        return is_valid;
+    }
+
+    public String getOrg_ids() {
+        return org_ids;
+    }
+
+    public void setOrg_ids(String org_ids) {
+        this.org_ids = org_ids;
+    }
+
+    public void setBd(String bd) {
+        this.bd = bd;
+    }
+
+    public String getMerchant_id() {
+        return merchant_id;
+    }
+
+    public void setMerchant_id(String merchant_id) {
+        this.merchant_id = merchant_id;
+    }
+
+    public String getSuburb() {
+        return suburb;
+    }
+
+    public void setSuburb(String suburb) {
+        this.suburb = suburb;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+}
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
index bcb07f1d4..52becae24 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
@@ -1,10 +1,13 @@
 package au.com.royalpay.payment.manage.appclient.core;
 
+import au.com.royalpay.payment.manage.appclient.beans.AppMerchantBean;
+import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo;
 import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
 import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
 import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
 import com.alibaba.fastjson.JSONObject;
 
+import java.util.Date;
 import java.util.List;
 
 public interface ManageAppService {
@@ -25,17 +28,21 @@ public interface ManageAppService {
 
     void updateClientRegisterInfo(JSONObject device, String clientMoniker, ClientRegisterInfo info);
 
-    List<JSONObject> listPartners(JSONObject device, PartnerQuery query);
+    JSONObject listPartners(JSONObject device, AppMerchantBean query);
 
     JSONObject clientDetail(JSONObject device, String clientMoniker);
 
+    JSONObject clientBankAccount(JSONObject device, String clientMoniker);
+
+    void saveBankAccount(JSONObject device, String clientMoniker, BankAccountInfo bankAccount);
+
     JSONObject getNewVersion(JSONObject device);
 
     JSONObject getCommons(JSONObject device);
 
     List<JSONObject> getOrgPrizeList(JSONObject device);
 
-    List<JSONObject> getBdConfigRates(JSONObject device);
+    List<JSONObject> getOrgPrizeDetail(JSONObject device, Date month);
 
     JSONObject getBdConfigKpi(JSONObject device);
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index 4fc8f2730..1a3fe3566 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -1,5 +1,6 @@
 package au.com.royalpay.payment.manage.appclient.core.impls;
 
+import au.com.royalpay.payment.manage.appclient.beans.AppMerchantBean;
 import au.com.royalpay.payment.manage.appclient.core.ManageAppService;
 import au.com.royalpay.payment.manage.bdprize.core.BDPrizeService;
 import au.com.royalpay.payment.manage.mappers.financial.FinancialBDConfigMapper;
@@ -10,6 +11,7 @@ import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
 import au.com.royalpay.payment.manage.mappers.system.ManageDeviceTokenMapper;
 import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
 import au.com.royalpay.payment.manage.mappers.system.OrgMapper;
+import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo;
 import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
 import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
@@ -111,11 +113,37 @@ public class ManageAppServiceImp implements ManageAppService {
     }
 
     @Override
-    public List<JSONObject> listPartners(JSONObject device, PartnerQuery query) {
+    public JSONObject listPartners(JSONObject device, AppMerchantBean query) {
         String clientType = device.getString("client_type");
         manageDeviceSupport.findRegister(clientType);
         JSONObject manager = managerMapper.findById(device.getString("manager_id"));
-        return clientManager.listPartners(manager, query);
+        switch (query.getStatus()) {
+            case 0:
+                query.setIs_valid(true);
+                break;
+            case 1:
+                query.setPass(true);
+                break;
+            case 2:
+                query.setApproving(true);
+                break;
+            case 3:
+                query.setCompleted_contract(true);
+                break;
+            case 4:
+                query.setBd_upload_material(true);
+                break;
+            case 5:
+                query.setApply_to_back(true);
+                break;
+            case 6:
+                query.setGreenChannel(true);
+                break;
+            case 7:
+                query.setQuickPass(true);
+                break;
+        }
+        return clientManager.listClientsByApp(manager, query);
     }
 
     @Override
@@ -126,6 +154,23 @@ public class ManageAppServiceImp implements ManageAppService {
         return clientManager.clientDetail(manager, clientMoniker);
     }
 
+    @Override
+    public JSONObject clientBankAccount(JSONObject device, String clientMoniker) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        return clientManager.listClientBankAccounts(manager, clientMoniker);
+    }
+
+    @Override
+    public void saveBankAccount(JSONObject device, String clientMoniker, BankAccountInfo bankAccount) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        clientManager.saveBankAccount(manager, clientMoniker, bankAccount);
+    }
+
+
     @Override
     public void updateDevTokenStatus(String devId, int status) {
         JSONObject devTokenObj = getDevTokenByDevId(devId);
@@ -238,15 +283,15 @@ public class ManageAppServiceImp implements ManageAppService {
         String clientType = device.getString("client_type");
         manageDeviceSupport.findRegister(clientType);
         JSONObject manager = managerMapper.findById(device.getString("manager_id"));
-        List<JSONObject> getOrgPrizeList = financialPartnerCommissionMapper.getOrgPrizeList(manager.getString("org_id"));
-        return getOrgPrizeList;
+        return financialPartnerCommissionMapper.getOrgPrizeList(manager.getString("org_id"));
     }
 
     @Override
-    public List<JSONObject> getBdConfigRates(JSONObject device) {
+    public List<JSONObject> getOrgPrizeDetail(JSONObject device, Date month) {
         String clientType = device.getString("client_type");
         manageDeviceSupport.findRegister(clientType);
-        return bdPrizeService.getRateConfig();
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        return financialPartnerCommissionMapper.getOrgPrizeDetail(manager.getString("org_id"), month);
     }
 
     @Override
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
index 433d4098b..afefb9f43 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -1,6 +1,8 @@
 package au.com.royalpay.payment.manage.appclient.web;
 
+import au.com.royalpay.payment.manage.appclient.beans.AppMerchantBean;
 import au.com.royalpay.payment.manage.appclient.core.ManageAppService;
+import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo;
 import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
 import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
 import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
@@ -8,9 +10,11 @@ import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
 import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient;
 import au.com.royalpay.payment.tools.device.manageadvise.AppClientController;
+import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.http.HttpUtils;
 import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.Errors;
@@ -19,6 +23,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.text.ParseException;
+import java.util.Date;
 import java.util.List;
 
 
@@ -73,7 +79,7 @@ public class ManageAppController {
     }
 
     @RequestMapping(value = "/merchants", method = RequestMethod.GET)
-    public List<JSONObject> listPartners(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, PartnerQuery query) {
+    public JSONObject listPartners(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, AppMerchantBean query) {
         return manageAppService.listPartners(device, query);
     }
 
@@ -82,6 +88,18 @@ public class ManageAppController {
         return manageAppService.clientDetail(device, clientMoniker);
     }
 
+    @RequestMapping(value = "/merchant/{clientMoniker}/bank_account", method = RequestMethod.GET)
+    public JSONObject getBankAccount(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        return manageAppService.clientBankAccount(device, clientMoniker);
+    }
+
+    @RequestMapping(value = "/merchant/{clientMoniker}/bank_account", method = RequestMethod.PUT)
+    public void saveBankAccount(@PathVariable String clientMoniker, @RequestBody @Valid BankAccountInfo bankAccount, Errors errors,
+                                @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        HttpUtils.handleValidErrors(errors);
+        manageAppService.saveBankAccount(device, clientMoniker, bankAccount);
+    }
+
     @RequestMapping(value = "/version", method = RequestMethod.GET)
     public JSONObject getAppVersion(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
         return manageAppService.getNewVersion(device);
@@ -97,9 +115,15 @@ public class ManageAppController {
         return manageAppService.getOrgPrizeList(device);
     }
 
-    @RequestMapping(value = "/bd/rates", method = RequestMethod.GET)
-    public List<JSONObject> getBdConfigRates(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
-        return manageAppService.getBdConfigRates(device);
+    @RequestMapping(value = "/org_prize/{monthStr}", method = RequestMethod.GET)
+    public List<JSONObject> getOrgPrizeDetail(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device,@PathVariable String monthStr) {
+        Date date;
+        try {
+            date =  DateUtils.parseDate(monthStr, new String[] { "yyyy-MM" });
+        } catch (ParseException e) {
+            throw new BadRequestException("Invalid month format");
+        }
+        return manageAppService.getOrgPrizeDetail(device, date);
     }
 
     @RequestMapping(value = "/bd/kpi", method = RequestMethod.GET)
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java
index a912023a3..3e2ce8b3d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java
@@ -8,6 +8,7 @@ import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,6 +27,8 @@ public interface FinancialPartnerCommissionMapper {
 
     List<JSONObject> getOrgPrizeList(@Param("org_id") String orgId);
 
+    List<JSONObject> getOrgPrizeDetail(@Param("org_id") String orgId,@Param("month") Date month);
+
     List<Integer> listAvailableMonths(@Param("year") int year);
 
     List<JSONObject> listWithOrgInfo(@Param("year") int year, @Param("month") int month);
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
index 63e40acb3..4741f59f3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
@@ -42,6 +42,8 @@ public interface ClientMapper {
 
     PageList<JSONObject> listPartners(JSONObject params, PageBounds pagination);
 
+    PageList<JSONObject> listLessInfoPartners(JSONObject params, PageBounds pagination);
+
     PageList<JSONObject> comListPartners(JSONObject params, PageBounds pagination);
 
     List<JSONObject> listClientsIdAndMoniker();
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 259370b90..a95a750c8 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
@@ -2,6 +2,7 @@ package au.com.royalpay.payment.manage.merchants.core;
 
 import au.com.royalpay.payment.core.exceptions.EmailException;
 import au.com.royalpay.payment.manage.appclient.beans.AppClientBean;
+import au.com.royalpay.payment.manage.appclient.beans.AppMerchantBean;
 import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo;
 import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo;
 import au.com.royalpay.payment.manage.merchants.beans.ClientRateConfig;
@@ -48,6 +49,8 @@ public interface ClientManager {
 
     JSONObject listClients(JSONObject manager, PartnerQuery query);
 
+    JSONObject listClientsByApp(JSONObject manager, AppMerchantBean query);
+
     List<JSONObject> listPartners(JSONObject manager, PartnerQuery query);
 
     @Transactional
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 dae46e247..1166a2423 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
@@ -19,6 +19,7 @@ import au.com.royalpay.payment.core.exceptions.ParamInvalidException;
 import au.com.royalpay.payment.core.utils.OrderExpiryRuleResolver;
 import au.com.royalpay.payment.manage.analysis.mappers.TransactionAnalysisMapper;
 import au.com.royalpay.payment.manage.appclient.beans.AppClientBean;
+import au.com.royalpay.payment.manage.appclient.beans.AppMerchantBean;
 import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService;
 import au.com.royalpay.payment.manage.device.core.DeviceManager;
 import au.com.royalpay.payment.manage.management.sysconfig.core.impls.PermissionPartnerManagerImpl;
@@ -534,6 +535,69 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         return PageListUtils.buildPageListResult(partners);
     }
 
+    @Override
+    public JSONObject listClientsByApp(JSONObject manager, AppMerchantBean query) {
+        JSONObject params = query.toJsonParam();
+        if (params.getString("org_id") != null) {
+            if (params.getString("org_ids") == null) {
+                orgIds(params, Integer.parseInt(params.getString("org_id")));
+            } else {
+                params.put("org_id", params.getString("org_ids"));
+                params.remove("org_ids");
+            }
+        }
+        JSONObject org = null;
+        if (params.getString("org_id") != null) {
+            org = orgMapper.findOne(params.getIntValue("org_id"));
+            if (org.getIntValue("type") == 1) {
+                params.put("referrer_id", org.getString("org_id"));
+                params.remove("org_id");
+            }
+        }
+        int orgId = manager.getIntValue("org_id");
+        if (orgId > 0) {
+            if (params.getString("org_ids") == null) {
+                JSONObject org2 = orgMapper.findOne(orgId);
+                if (org2.getString("parent_org_id") != null) {
+                    params.put("org_id", orgId);
+                } else {
+                    params.put("org_id", orgId);
+                    orgIds(params, orgId);
+                }
+            } else {
+                params.put("org_id", params.getIntValue("org_ids"));
+                params.remove("org_ids");
+            }
+        }
+        if (ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) {
+            JSONObject bdConfig = financialBDConfigMapper.getBdConfig(manager.getString("manager_id"));
+            if (bdConfig != null) {
+                params.put("bd_group", bdConfig.getString("bd_group"));
+                List<JSONObject> listGroupBds = financialBDConfigMapper.listGroupBds(bdConfig.getString("bd_group"));
+                List<String> bdUserId = listGroupBds.stream().map(groupBd -> groupBd.getString("manager_id")).collect(Collectors.toList());
+                if (params.containsKey("bd_user")) {
+                    if (!bdUserId.contains(params.getString("bd_user"))) {
+                        params.remove("bd_user");
+                    }
+                }
+                if (params.containsKey("org_ids")) {
+                    params.remove("org_ids");
+                }
+                if (params.containsKey("org_id")) {
+                    params.remove("org_id");
+                }
+            }
+
+            if (query.getOnlyMe()) {
+                params.put("bd_user", manager.getString("manager_id"));
+            }
+        }
+        PageList<JSONObject> partners = clientMapper.listLessInfoPartners(params,
+                new PageBounds(query.getPage(), query.getLimit(), Order.formString("is_valid.desc,-approve_time.asc,create_time.desc")));
+        int authDays = PlatformEnvironment.getEnv().authDays();// 快速自助开通申请有效期
+        return PageListUtils.buildPageListResult(partners);
+    }
+
     private void orgIds(JSONObject params, int orgId) {
         JSONObject param = new JSONObject();
         param.put("parent_org_id", params.getString("org_id"));
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
index 50b3bf110..3856b6efc 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
@@ -5,8 +5,17 @@
         SELECT *
         FROM financial_partner_commission
         WHERE org_id = #{org_id}
+        GROUP BY `year`,`month`
         ORDER BY `year` DESC,`month` DESC
     </select>
+    <select id="getOrgPrizeDetail" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT *
+        FROM financial_partner_commission
+        WHERE org_id = #{org_id}
+        AND
+        `year` = year(month)
+        AND `month` = month(month)
+    </select>
     <select id="listAvailableMonths" resultType="java.lang.Integer">
         SELECT DISTINCT `month`
         FROM financial_partner_commission
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 520101f71..e46b2703e 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
@@ -154,6 +154,85 @@
             <if test="is_valid">and c.is_valid=1</if>
         </where>
     </select>
+
+    <select id="listLessInfoPartners" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT DISTINCT c.client_moniker,c.source,c.approve_result,c.short_name,c.company_phone,c.approve_time,c.create_time,c.open_status,c.address,c.state,c.suburb,c.is_valid,c.postcode,c.country,o.name org_name
+        FROM sys_clients c
+        inner join sys_client_config cc on cc.client_id = c.client_id
+        inner join sys_org o
+        on o.org_id=c.org_id
+        <if test="bd_user!=null">
+            INNER JOIN sys_client_bd d ON c.client_id = d.client_id AND d.bd_id = #{bd_user} and
+            date(d.start_date)&lt;= date(now()) and (d.end_date is null or date(d.end_date)&gt;= date(now())) and
+            d.is_valid=1
+        </if>
+        <where>
+            <if test="bd_group!=null">and c.client_id in
+                (SELECT b.client_id FROM sys_client_bd b
+                INNER JOIN financial_bd_config fb ON fb.manager_id=b.bd_id
+                where b.is_valid=1 and b.start_date&lt;=now() and (b.end_date is null or b.end_date &gt;= now())
+                AND (fb.bd_group=#{bd_group} or fb.manager_id=#{bd_group})
+                )
+            </if>
+            <if test="approving">
+                and ((c.approve_result=4 and c.open_status is null) or (c.approve_result=3 and c.open_status is null) or
+                c.open_status=1 or c.open_status=2 or c.open_status=4)
+            </if>
+            <if test="quickPass">
+                and c.source=4
+            </if>
+            <if test="greenChannel">
+                and ((c.source=1 or c.source=2) and c.approve_result=2 or c.open_status=10)
+            </if>
+            <if test="greenChannelBdTodo">
+                and ((c.source=1 or c.source=2) and c.approve_result=2 and (c.open_status is null or c.open_status=3))
+            </if>
+            <if test="pass">
+                and c.open_status = 5 AND c.approve_result = 1 AND c.approve_time IS NOT NULL
+            </if>
+            <if test="completed_contract">
+                and c.open_status IS NULL AND c.approve_result IS NULL AND c.source != 4
+            </if>
+            <if test="apply_to_back">
+                AND c.approve_result = 5 AND c.approve_time is NOT NULL
+            </if>
+            <if test="bd_upload_material">
+                AND c.open_status = 3 AND c.approve_result != 5
+            </if>
+            <if test="search_text!=null">
+                <bind name="name_pattern" value="'%'+search_text+'%'"/>
+                <if test="text_type=='all'">
+                    and (c.client_moniker=#{search_text} or c.short_name like #{name_pattern} or c.company_name like
+                    #{name_pattern} or c.business_name like #{name_pattern} or c.remark like
+                    #{name_pattern} or c.contact_email=#{search_text})
+                </if>
+                <if test="text_type=='client_moniker'">
+                    and c.client_moniker=#{search_text}
+                </if>
+                <if test="text_type=='client_name'">
+                    and c.short_name like #{name_pattern}
+                </if>
+                <if test="text_type=='company_name'">
+                    and c.company_name like #{name_pattern}
+                </if>
+                <if test="text_type=='business_name'">
+                    and c.business_name like #{name_pattern}
+                </if>
+                <if test="text_type=='contact_email'">
+                    and c.contact_email = #{search_text}
+                </if>
+                <if test="text_type=='remark'">
+                    and c.remark like #{name_pattern}
+                </if>
+            </if>
+            <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
+            <if test="org_ids!=null">and c.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
+            </if>
+            <if test="is_valid">and c.is_valid=0</if>
+        </where>
+    </select>
+
     <select id="comListPartners" resultType="com.alibaba.fastjson.JSONObject">
         SELECT DISTINCT c.*,o.name org_name
         FROM sys_clients c

From e4427468a987fcbfdc5089b457c724e2dc37c2a8 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 15 Mar 2019 14:52:41 +0800
Subject: [PATCH 10/38] =?UTF-8?q?add=20app=E8=B4=B9=E7=8E=87=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=81=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appclient/core/ManageAppService.java      | 18 +++++
 .../core/impls/ManageAppServiceImp.java       | 68 ++++++++++++++++++-
 .../appclient/web/ManageAppController.java    | 44 ++++++++++++
 3 files changed, 127 insertions(+), 3 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
index 52becae24..e943d9804 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
@@ -2,6 +2,7 @@ package au.com.royalpay.payment.manage.appclient.core;
 
 import au.com.royalpay.payment.manage.appclient.beans.AppMerchantBean;
 import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo;
+import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo;
 import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
 import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
 import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
@@ -9,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 public interface ManageAppService {
 
@@ -36,6 +38,22 @@ public interface ManageAppService {
 
     void saveBankAccount(JSONObject device, String clientMoniker, BankAccountInfo bankAccount);
 
+    void newConfigRate(JSONObject device, String clientMoniker, JSONObject config);
+
+    void commitToGreenChannel(JSONObject device, String clientMoniker);
+
+    void commitToDoAgreeFile(JSONObject device, String clientMoniker);
+
+    void commitToCompliance(JSONObject device, String clientMoniker);
+
+    JSONObject getAuthFiles(JSONObject device, String clientMoniker);
+
+    void uploadAuthFiles(JSONObject device, String clientMoniker, ClientAuthFilesInfo filesInfo);
+
+    Map<String, List<JSONObject>> getRates(JSONObject device, String clientMoniker);
+
+    JSONObject getConfigRates(JSONObject device);
+
     JSONObject getNewVersion(JSONObject device);
 
     JSONObject getCommons(JSONObject device);
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index 1a3fe3566..56f5b72dc 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -12,6 +12,7 @@ import au.com.royalpay.payment.manage.mappers.system.ManageDeviceTokenMapper;
 import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
 import au.com.royalpay.payment.manage.mappers.system.OrgMapper;
 import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo;
+import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo;
 import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
 import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
@@ -32,9 +33,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class ManageAppServiceImp implements ManageAppService {
@@ -170,6 +170,68 @@ public class ManageAppServiceImp implements ManageAppService {
         clientManager.saveBankAccount(manager, clientMoniker, bankAccount);
     }
 
+    @Override
+    public Map<String, List<JSONObject>> getRates(JSONObject device, String clientMoniker) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        List<JSONObject> rates = clientManager.clientRates(clientMoniker, true);
+        return rates.stream().collect(Collectors.groupingBy(e -> e.getString("rate_name"),HashMap::new,Collectors.toList()));
+    }
+
+    @Override
+    public JSONObject getConfigRates(JSONObject device) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        return clientManager.getSysRateConfig();
+    }
+
+    @Override
+    public void newConfigRate(JSONObject device, String clientMoniker, JSONObject config) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        clientManager.newConfigRate(manager, clientMoniker, config);
+    }
+
+    @Override
+    public void commitToGreenChannel(JSONObject device, String clientMoniker) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        clientManager.commitToGreenChannel(clientMoniker, manager);
+    }
+
+    @Override
+    public void commitToDoAgreeFile(JSONObject device, String clientMoniker) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        clientManager.commitToDoAgreeFile(clientMoniker, manager);
+    }
+
+    @Override
+    public void commitToCompliance(JSONObject device, String clientMoniker) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        clientManager.commitToCompliance(clientMoniker, manager);
+    }
+
+    @Override
+    public JSONObject getAuthFiles(JSONObject device, String clientMoniker) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        return clientManager.getAuthFiles(manager, clientMoniker);
+    }
+
+    @Override
+    public void uploadAuthFiles(JSONObject device, String clientMoniker, ClientAuthFilesInfo filesInfo) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        clientManager.uploadAuthFiles(manager, clientMoniker,filesInfo);
+    }
 
     @Override
     public void updateDevTokenStatus(String devId, int status) {
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
index afefb9f43..6f527699d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -3,6 +3,7 @@ package au.com.royalpay.payment.manage.appclient.web;
 import au.com.royalpay.payment.manage.appclient.beans.AppMerchantBean;
 import au.com.royalpay.payment.manage.appclient.core.ManageAppService;
 import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo;
+import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo;
 import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
 import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
 import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
@@ -26,6 +27,7 @@ import javax.validation.Valid;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 
 @AppClientController
@@ -100,6 +102,48 @@ public class ManageAppController {
         manageAppService.saveBankAccount(device, clientMoniker, bankAccount);
     }
 
+    @RequestMapping(value = "/merchant/{clientMoniker}/rates", method = RequestMethod.GET)
+    public Map<String,List<JSONObject>> getRates(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        return manageAppService.getRates(device, clientMoniker);
+    }
+
+    @RequestMapping(value = "/merchant/rate_config", method = RequestMethod.GET)
+    public JSONObject getConfigRates(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        return manageAppService.getConfigRates(device);
+    }
+
+    @RequestMapping(value = "/merchant/{clientMoniker}/rates", method = RequestMethod.POST)
+    public void newRate(@PathVariable String clientMoniker, @RequestBody JSONObject config, Errors errors,
+                        @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        HttpUtils.handleValidErrors(errors);
+        manageAppService.newConfigRate(device, clientMoniker, config);
+    }
+
+    @RequestMapping(value = "/merchant/{clientMoniker}/compliance/green_channel", method = RequestMethod.PUT)
+    public void commitToGreenChannel(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        manageAppService.commitToGreenChannel(device, clientMoniker);
+    }
+
+    @RequestMapping(value = "/merchant/{clientMoniker}/make_agree_file", method = RequestMethod.PUT)
+    public void commitToDoAgreeFile(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        manageAppService.commitToDoAgreeFile(device, clientMoniker);
+    }
+
+    @RequestMapping(value = "/merchant/{clientMoniker}/to_compliance", method = RequestMethod.PUT)
+    public void commitToCompliance(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        manageAppService.commitToCompliance(device, clientMoniker);
+    }
+
+    @RequestMapping(value = "/merchant/{clientMoniker}/file", method = RequestMethod.GET)
+    public JSONObject getAuthFiles(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        return manageAppService.getAuthFiles(device, clientMoniker);
+    }
+
+    @RequestMapping(value = "/merchant/{clientMoniker}/file", method = RequestMethod.PUT)
+    public void uploadAuthFiles(@PathVariable String clientMoniker, @RequestBody ClientAuthFilesInfo filesInfo, @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        manageAppService.uploadAuthFiles(device, clientMoniker, filesInfo);
+    }
+
     @RequestMapping(value = "/version", method = RequestMethod.GET)
     public JSONObject getAppVersion(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
         return manageAppService.getNewVersion(device);

From 3c19d2ae93fcac94d13c1bcd1008ba6f935b4362 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 20 Mar 2019 09:21:48 +0800
Subject: [PATCH 11/38] temp commit

---
 .../core/impls/ManageAppServiceImp.java       |  6 +++++-
 .../appclient/web/ManageAppController.java    | 20 +++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index 56f5b72dc..89d857189 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -345,7 +345,11 @@ public class ManageAppServiceImp implements ManageAppService {
         String clientType = device.getString("client_type");
         manageDeviceSupport.findRegister(clientType);
         JSONObject manager = managerMapper.findById(device.getString("manager_id"));
-        return financialPartnerCommissionMapper.getOrgPrizeList(manager.getString("org_id"));
+        List<JSONObject> orgPrizeList = financialPartnerCommissionMapper.getOrgPrizeList(manager.getString("org_id"));
+        for (JSONObject params : orgPrizeList) {
+            params.put("data", financialPartnerCommissionMapper.find(params.getIntValue("year"), params.getIntValue("month"), manager.getString("org_id")));
+        }
+        return orgPrizeList;
     }
 
     @Override
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
index 6f527699d..d2ae40de6 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -159,16 +159,16 @@ public class ManageAppController {
         return manageAppService.getOrgPrizeList(device);
     }
 
-    @RequestMapping(value = "/org_prize/{monthStr}", method = RequestMethod.GET)
-    public List<JSONObject> getOrgPrizeDetail(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device,@PathVariable String monthStr) {
-        Date date;
-        try {
-            date =  DateUtils.parseDate(monthStr, new String[] { "yyyy-MM" });
-        } catch (ParseException e) {
-            throw new BadRequestException("Invalid month format");
-        }
-        return manageAppService.getOrgPrizeDetail(device, date);
-    }
+//    @RequestMapping(value = "/org_prize/{monthStr}", method = RequestMethod.GET)
+//    public List<JSONObject> getOrgPrizeDetail(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device,@PathVariable String monthStr) {
+//        Date date;
+//        try {
+//            date =  DateUtils.parseDate(monthStr, new String[] { "yyyy-MM" });
+//        } catch (ParseException e) {
+//            throw new BadRequestException("Invalid month format");
+//        }
+//        return manageAppService.getOrgPrizeDetail(device, date);
+//    }
 
     @RequestMapping(value = "/bd/kpi", method = RequestMethod.GET)
     public JSONObject getBdConfigKpi(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {

From cffd93f282dad973755f1979a539a58be7fbade2 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 21 Mar 2019 15:47:30 +0800
Subject: [PATCH 12/38] temp commit

---
 .../payment/manage/appclient/core/ManageAppService.java     | 2 ++
 .../manage/appclient/core/impls/ManageAppServiceImp.java    | 6 ++++++
 .../payment/manage/appclient/web/ManageAppController.java   | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
index e943d9804..3e876d596 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
@@ -64,4 +64,6 @@ public interface ManageAppService {
 
     JSONObject getBdConfigKpi(JSONObject device);
 
+    List<JSONObject>  getBdPrizeList(JSONObject device);
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index 89d857189..822e80834 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -367,4 +367,10 @@ public class ManageAppServiceImp implements ManageAppService {
         JSONObject manager = managerMapper.findById(device.getString("manager_id"));
         return financialBDConfigMapper.getBDConfigById(manager.getString("manager_id"));
     }
+
+    @Override
+    public List<JSONObject>  getBdPrizeList(JSONObject device) {
+        //todo 获取BD提成列表
+        return null;
+    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
index d2ae40de6..242f076e1 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -174,4 +174,10 @@ public class ManageAppController {
     public JSONObject getBdConfigKpi(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
         return manageAppService.getBdConfigKpi(device);
     }
+
+    @RequestMapping(value = "/bd/list", method = RequestMethod.GET)
+    public List<JSONObject> getBdPrizeList(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        return manageAppService.getBdPrizeList(device);
+    }
+
 }

From 1957b7775bc747258d8038e2e6b0fca904cdbe81 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 21 Mar 2019 18:40:46 +0800
Subject: [PATCH 13/38] fix

---
 .../royalpay/payment/manage/signin/web/SignInController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java b/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java
index a6c4a8b21..fbf656118 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java
@@ -356,7 +356,7 @@ public class SignInController {
 
     @ConsumersAction
     @RequestMapping(value = "/customer_qrcode_scan/{codeId}", method = RequestMethod.GET)
-    public ModelAndView scanCustomerWechatQrcode(@PathVariable String codeId, @ModelAttribute(com.globalfreepay.payment.tools.CommonConsts.CONSUMER_INFO) JSONObject customerInfo) {
+    public ModelAndView scanCustomerWechatQrcode(@PathVariable String codeId, @ModelAttribute(CommonConsts.CONSUMER_INFO) JSONObject customerInfo) {
         signInStatusManager.scanCustomerQrcode(codeId, customerInfo.getString("customer_id"));
         return new ModelAndView("manager_bind_success");
     }

From 82d2385fde536a2e0a86f0bd6e7c05e0cce0b3b2 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 22 Mar 2019 17:34:57 +0800
Subject: [PATCH 14/38] tmp commit

---
 .../manage/appclient/core/ManageAppService.java |  1 -
 .../core/impls/ManageAppServiceImp.java         | 17 ++++++++---------
 .../appclient/web/ManageAppController.java      | 12 ------------
 .../web/RetailValidationController.java         |  4 ++++
 .../financial/FinancialBDPrizeLogMapper.java    | 12 ++++++++++++
 5 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
index 3e876d596..a80593140 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
@@ -60,7 +60,6 @@ public interface ManageAppService {
 
     List<JSONObject> getOrgPrizeList(JSONObject device);
 
-    List<JSONObject> getOrgPrizeDetail(JSONObject device, Date month);
 
     JSONObject getBdConfigKpi(JSONObject device);
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index 822e80834..29e37f1df 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -352,14 +352,6 @@ public class ManageAppServiceImp implements ManageAppService {
         return orgPrizeList;
     }
 
-    @Override
-    public List<JSONObject> getOrgPrizeDetail(JSONObject device, Date month) {
-        String clientType = device.getString("client_type");
-        manageDeviceSupport.findRegister(clientType);
-        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
-        return financialPartnerCommissionMapper.getOrgPrizeDetail(manager.getString("org_id"), month);
-    }
-
     @Override
     public JSONObject getBdConfigKpi(JSONObject device) {
         String clientType = device.getString("client_type");
@@ -371,6 +363,13 @@ public class ManageAppServiceImp implements ManageAppService {
     @Override
     public List<JSONObject>  getBdPrizeList(JSONObject device) {
         //todo 获取BD提成列表
-        return null;
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        List<JSONObject> listBdPrizeLogByOne = financialBDPrizeLogMapper.listBdPrizeLogByOne(manager.getString("manager_id"));
+        for (JSONObject log : listBdPrizeLogByOne) {
+            log.put("data", financialBDPrizeLogMapper.findReportByOne(log.getString("record_id"), manager.getString("manager_id")));
+        }
+        return listBdPrizeLogByOne;
     }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
index 242f076e1..81ac37fd0 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -33,7 +33,6 @@ import java.util.Map;
 @AppClientController
 @RequestMapping("/api/v1.0/manage/app")
 public class ManageAppController {
-    Logger logger = LoggerFactory.getLogger(getClass());
 
     @Resource
     private ManageAppService manageAppService;
@@ -159,17 +158,6 @@ public class ManageAppController {
         return manageAppService.getOrgPrizeList(device);
     }
 
-//    @RequestMapping(value = "/org_prize/{monthStr}", method = RequestMethod.GET)
-//    public List<JSONObject> getOrgPrizeDetail(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device,@PathVariable String monthStr) {
-//        Date date;
-//        try {
-//            date =  DateUtils.parseDate(monthStr, new String[] { "yyyy-MM" });
-//        } catch (ParseException e) {
-//            throw new BadRequestException("Invalid month format");
-//        }
-//        return manageAppService.getOrgPrizeDetail(device, date);
-//    }
-
     @RequestMapping(value = "/bd/kpi", method = RequestMethod.GET)
     public JSONObject getBdConfigKpi(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
         return manageAppService.getBdConfigKpi(device);
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
index b4f4bf3e5..42fe88012 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
@@ -96,6 +96,10 @@ public class RetailValidationController {
 //            deviceSupport.validDeviceWithClient(manager, loginInfo.getDevId());
 //        }
         manager.put("sign_key", signKey);
+        manager.remove("available_func_ids");
+        manager.remove("available_func_names");
+        manager.remove("modules");
+        manager.remove("module_names");
         return manager;
     }
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java
index cbd0e1005..c49a8cedf 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java
@@ -48,4 +48,16 @@ public interface FinancialBDPrizeLogMapper {
 
     @AutoSql(type = SqlType.DELETE)
     void clearLogsOfReport(@Param("record_id") String recordId);
+
+    @Select("select bpl.record_id,bpl.manager_id,bpl.bd_name,sum(bpl.total_amount) total_amount,sum(bpl.total_prize) total_prize,sum(bpl.total_donation) total_donation,sum(bpl.send_prize) send_prize,sum(bpl.hold_prize) hold_prize," +
+            "bpl.kpi_amount,bpr.`month` " +
+            "from financial_bd_prize_log bpl INNER JOIN financial_bd_prize_records bpr on bpl.record_id = bpr.record_id " +
+            "where bpl.manager_id= #{manager_id} " +
+            "and bpl.channel!='ALL' " +
+            "group by bpr.month " +
+            "ORDER BY bpr.month desc")
+    List<JSONObject> listBdPrizeLogByOne(@Param("manager_id") String manager_id);
+
+    @AutoSql(type = SqlType.SELECT)
+    List<JSONObject> findReportByOne(@Param("record_id") String recordId, @Param("manager_id") String managerId);
 }

From c6d46a8b8fb5fd880e3145442eb8f97f17fb1037 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 25 Mar 2019 09:37:26 +0800
Subject: [PATCH 15/38] fix representative_id

---
 .../manage/merchants/web/PartnerManageController.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
index 58eb2a3e7..8f3ed6374 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
@@ -601,8 +601,8 @@ public class PartnerManageController {
     }
 
     @ManagerMapping(value = "/{clientMoniker}/register/alipay_gms", method = RequestMethod.POST, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})
-    public void registerAlipayGms(@PathVariable String clientMoniker,@RequestBody String representative_id,@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
-        clientManager.registerAlipayGms(clientMoniker, representative_id, manager);
+    public void registerAlipayGms(@PathVariable String clientMoniker,@RequestBody JSONObject representative_id,@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+        clientManager.registerAlipayGms(clientMoniker, representative_id.getString("representative_id"), manager);
     }
 
     @ManagerMapping(value = "/{clientMoniker}/query/alipay_gms", method = RequestMethod.GET, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})
@@ -611,8 +611,8 @@ public class PartnerManageController {
     }
 
     @ManagerMapping(value = "/{clientMoniker}/register/alipayOnline_gms", method = RequestMethod.POST, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})
-    public void registerAlipayOnlineGms(@PathVariable String clientMoniker,@RequestBody String representative_id,@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
-        clientManager.registerAlipayOnlineGms(clientMoniker, representative_id, manager);
+    public void registerAlipayOnlineGms(@PathVariable String clientMoniker,@RequestBody JSONObject representative_id,@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+        clientManager.registerAlipayOnlineGms(clientMoniker, representative_id.getString("representative_id"), manager);
     }
 
     @ManagerMapping(value = "/{clientMoniker}/query/alipayOnline_gms", method = RequestMethod.GET, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})

From 26487813fcc210772960307368dbd3e2d93bc201 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 25 Mar 2019 09:42:56 +0800
Subject: [PATCH 16/38] fix representative_id

---
 .../payment/manage/merchants/core/ClientManager.java      | 4 ++--
 .../manage/merchants/core/impls/ClientManagerImpl.java    | 8 ++++----
 .../manage/merchants/web/PartnerManageController.java     | 4 ++--
 3 files changed, 8 insertions(+), 8 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 5c2bd86e5..4e8151f6b 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
@@ -327,9 +327,9 @@ public interface ClientManager {
 
     String subMerchantApplication(String clientMoniker, SubMerchantIdApply subMerchantApply,JSONObject manager);
 
-    void registerAlipayGms(String clientMoniker, String representative_id, JSONObject manager);
+    void registerAlipayGms(String clientMoniker, JSONObject representative_id, JSONObject manager);
 
-    void registerAlipayOnlineGms(String clientMoniker, String representative_id, JSONObject manager);
+    void registerAlipayOnlineGms(String clientMoniker, JSONObject representative_id, JSONObject manager);
 
     String queryAlipayGmsStatus(String clientMoniker, JSONObject manager);
 
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 71ed800b7..2196babf0 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
@@ -3789,7 +3789,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
-    public void registerAlipayGms(String clientMoniker, String representative_id, JSONObject manager) {
+    public void registerAlipayGms(String clientMoniker, JSONObject representative_id, JSONObject manager) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);
         if (client == null) {
             throw new InvalidShortIdException();
@@ -3805,7 +3805,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         client.put("bank_id", client_bank.getString("account_no"));
 
         if (!"Company".equals(client.getString("business_structure"))) {
-            if (representative_id == null || representative_id.isEmpty()) {
+            if (StringUtils.isBlank(representative_id.getString("representative_id"))) {
                 throw new BadRequestException("ID or passport number can't be null");
             }
             client.put("representative_id", representative_id);
@@ -3843,7 +3843,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
-    public void registerAlipayOnlineGms(String clientMoniker, String representative_id, JSONObject manager) {
+    public void registerAlipayOnlineGms(String clientMoniker, JSONObject representative_id, JSONObject manager) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);
         if (client == null) {
             throw new InvalidShortIdException();
@@ -3858,7 +3858,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         client.put("bank_id", client_bank.getString("account_no"));
 
-        if (representative_id == null || representative_id.isEmpty()) {
+        if (StringUtils.isBlank(representative_id.getString("representative_id"))) {
             throw new BadRequestException("ID or passport number can't be null");
         }
         client.put("representative_id", representative_id);
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
index 8f3ed6374..14065bb90 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
@@ -602,7 +602,7 @@ public class PartnerManageController {
 
     @ManagerMapping(value = "/{clientMoniker}/register/alipay_gms", method = RequestMethod.POST, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})
     public void registerAlipayGms(@PathVariable String clientMoniker,@RequestBody JSONObject representative_id,@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
-        clientManager.registerAlipayGms(clientMoniker, representative_id.getString("representative_id"), manager);
+        clientManager.registerAlipayGms(clientMoniker, representative_id, manager);
     }
 
     @ManagerMapping(value = "/{clientMoniker}/query/alipay_gms", method = RequestMethod.GET, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})
@@ -612,7 +612,7 @@ public class PartnerManageController {
 
     @ManagerMapping(value = "/{clientMoniker}/register/alipayOnline_gms", method = RequestMethod.POST, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})
     public void registerAlipayOnlineGms(@PathVariable String clientMoniker,@RequestBody JSONObject representative_id,@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
-        clientManager.registerAlipayOnlineGms(clientMoniker, representative_id.getString("representative_id"), manager);
+        clientManager.registerAlipayOnlineGms(clientMoniker, representative_id, manager);
     }
 
     @ManagerMapping(value = "/{clientMoniker}/query/alipayOnline_gms", method = RequestMethod.GET, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})

From 65c5bda2ad7091e843a759a7d206b4caee1a836b Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 25 Mar 2019 10:01:42 +0800
Subject: [PATCH 17/38] fix

---
 .../manage/merchants/core/impls/ClientManagerImpl.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 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 2196babf0..f67055d29 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
@@ -3808,7 +3808,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             if (StringUtils.isBlank(representative_id.getString("representative_id"))) {
                 throw new BadRequestException("ID or passport number can't be null");
             }
-            client.put("representative_id", representative_id);
+            client.put("representative_id", representative_id.getString("representative_id"));
         }
 
         AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayRetailMerchant();
@@ -3861,7 +3861,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (StringUtils.isBlank(representative_id.getString("representative_id"))) {
             throw new BadRequestException("ID or passport number can't be null");
         }
-        client.put("representative_id", representative_id);
+        client.put("representative_id", representative_id.getString("representative_id"));
 
         AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant();
         Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client);

From 3c221c1cd628e41754195f79d26e923e5540e330 Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Mon, 25 Mar 2019 10:57:15 +0800
Subject: [PATCH 18/38] Merge branch 'develop' of
 D:\globalpay\9009_manage_develop\royalpay.manage with conflicts.

---
 .../core/impls/ClientManagerImpl.java         |   5 +--
 src/main/resources/apple_message_cert_dev.p12 | Bin 3197 -> 3185 bytes
 .../resources/apple_message_cert_product.p12  | Bin 3313 -> 3185 bytes
 src/main/resources/application-dev.properties |   2 +-
 .../resources/application-local.properties    |   2 +-
 src/main/resources/application.properties     |  33 +++++++++++-------
 .../jasper/partner_invoice_gst.jasper         | Bin 80864 -> 81159 bytes
 .../jasper/partner_invoice_gst_bak.jasper     | Bin 0 -> 80864 bytes
 src/main/resources/jasper/royalpay_logo.png   | Bin 1770 -> 11978 bytes
 .../resources/jasper/royalpay_logo_bak.png    | Bin 0 -> 1770 bytes
 10 files changed, 25 insertions(+), 17 deletions(-)
 create mode 100644 src/main/resources/jasper/partner_invoice_gst_bak.jasper
 create mode 100644 src/main/resources/jasper/royalpay_logo_bak.png

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 2196babf0..9786c481b 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
@@ -3812,7 +3812,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
 
         AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayRetailMerchant();
-        Element resultElement = alipayClient.registerGmsPortal(mch.getPid(), client);
+        //Element resultElement = alipayClient.registerGmsPortal(mch.getPid(), client);
+        Element resultElement = null;
         if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {
             throw new BadRequestException(resultElement.elementText("error"));
         }
@@ -4026,7 +4027,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         yeepayConfig.put("industry",merchantInfo.getString("industry"));
         yeepayConfig.put("business_content",merchantInfo.getString("business_content"));
         yeepayConfig.put("business_licence",merchantInfo.getString("business_licence"));
-        yeePayClientConfigMapper.update(yeepayConfig);
+        //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"));
diff --git a/src/main/resources/apple_message_cert_dev.p12 b/src/main/resources/apple_message_cert_dev.p12
index 85d80de10a47358303a763a465ae67e2d56299d0..905e2cc1f9a781dadadea431f38b687ef7fc156c 100644
GIT binary patch
delta 3124
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
O(YOfcaK8pq0s#T%Kjp{(

delta 3136
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
aiR<m+-I9(mG|L1CP!S*4YTZGH0s#Sc*!^z+

diff --git a/src/main/resources/apple_message_cert_product.p12 b/src/main/resources/apple_message_cert_product.p12
index 205da3527cb39cd520134bd4bc63ec204b397cb8..905e2cc1f9a781dadadea431f38b687ef7fc156c 100644
GIT binary patch
delta 3087
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

delta 3216
zcmV;B3~%%C81WfEFoF#20s#Xsf(*0<2`Yw2hW8Bt2LYgh45b8u452WB44p872R{Z0
zDuzgg_YDCD2B3lmFff7#ECK-lFoFjqkw6`PvWI}rVGG&f0s;sCfPx12?=&BbOLQ(t
zUErO2yHmVdQ8B;j(l$gLxaz7`5ME}nx30c+!^*(?1+MSgtN%@1s~-j$P+^d_H{z(#
za^s~|#R4_1xWb}Z+iz1ao)2xHjwoLM&4Dc86~hu**Bid<(kJxi=<6Y;Xv<R+G-bVi
z2q=P%Dm;~bc_^EALQ(2^T_3$Og@BJ8KmjJ88Nl#J;Xi^FEziA?34hj+fB79c%{W`e
zAY_{dgoXs4_WDRo>$XQdCjb|iUl6`5C^-N?qUotHug;Hce^Tsl6tek_HVQb3JMTrd
z1*(*mm}Vn4wkC9mh>kvvS_uJxemQ1;_zxFQhGMZ4-yWaVnXJ3Rz|r+M%P5EshSyPS
z>@l@rF;y;IQeK5MHhGZVE;6zn;0DL~k%6)w9f5Kq4Z&^Zn}x?;yGa+?%Sy_L=)kA;
zl+dg-A`okojXVU`OU_F4qQc5<7QuGBvXR9fbl1NEJsyIsYG@3<sbTS+1`UyaAdXh|
zSGmLLE_-n8a9vX~27Jm6&7+=#*NB$&fzPC9?(vqW?Ca5t{J6fu*Vf#oDj^`AG-iZR
z@MLIXSv8XY57vH|we{qq?M79}^Qd2l--i@q)zH1nUMTnojA%a&P`dcQz-ggXny8KP
zEYr`tC&Q$XLSCMm^(Bsqt;{Qbw?(=p<*-<()T;qiTPtf11yUo~x9V{$U2b6%rhh{S
zJEiJxS3yTs8QtXCr90}qx6ZFGl1U}yeA)A^Q^w3UM5Z$vFe|G{rRKJ}P2}lNuULU^
z8OroDZPS}-IfTI(w;RX4^~Lxb#TMAnn(GX^VDw%pCYwLFWPSs+_k9+BT3L83I;xKA
zgWhMOr<xpZY%!7RN2cr)S~s-Xt-}4vyvvS=-a&(fHm=*hXX_)*>3UPP?EidgR9sV8
zkxaR~3#ij*3lcoxc=}1>cczfuTC1{HQoK3xx5izV33799cMZ2gb|y>YzGah-CGA_Z
ztsn(D4_vD-vktC0V<54ATN>~k@L3+L_8BIW?|wr=JuRxtc?A<FvVC$7#YR_9+JA$#
zzrdySPrMr`M5Z(uno}+77=h5jgf>1>{5p9A?t@PBJ7H!BY(cQ`^@lr{T612P%@en;
zVRgYUAYF9Gk4l3+F^e3)0N^E+J^0x(fK7cxBA_%WLriFb&>4S!4=q;(mAHC>?w(Yi
z6W>c2Xw<+X#lOl|ktyO3nohw7Pt^UwuaA|c>w$92#4BU1gJ1>oAQUoqV!jUw=3E&3
z6jI&Ff8hpMWlE}dkDwe;l>J+5bT4=lovO1@?Fn(b8H>8#%>lOgv-m7u<64Y;H&vsM
z-u2uv!Cv8d^S1SWX=AvUvaR$qW?T|I69}hO?9UT-PRXrGoG%(~bHH?vwS!jGrjA!0
zpLDXZHacL%5tHtamT3^5$}K09PEW<zilXfNZDscuShK~cEx5_U6a}v1iEIC{Y_h^T
zY?3%Czthc&S+Kv*f@dxoJ$Bm?uBgpM-3xgXRVtWQ^;uYdB>%C|hDJ`;VzFci7Cb7B
zNqnH&SgBmyw;_asHXJ1cwcSl&hHA<xO~aJ@>aQ&-u%Z~RL%zv)uL@VXNNVqGe#PVm
zjs&N4+rJ`TaP@Mxn0z&#grWJcIK4FJGNgwH`n(aDClFAYtPp?_^;XxJOrtUcxjP7{
z+lyPu0Zj;h0wTm{JFf%uKP{y>8Lr-i*yfGg6w$3~SS0j#lbRu|qT3}RAe&3Wt*Tta
zs!`J--MQmETK64rzH{M<hWS2!;|ie#D%BraG3bbDQnOBpn6ufprH6{2<M;NQJqKh(
zcv`m*8IH*biY~jv^v5(CLVipHBhDNdr}^F@OB&;U2&7Gg@+e6E^A$^?jzSvhG8<RE
z%K8!AOopYG_AP_^*Vu=B;&WuGsF~ZcKg=|9_4#7*yEhQx7l3PoaDTWn0hk#XzScsW
z3<mdG(fl&_&ffcwz#_(ps}@noO0<5i`6oPc4`2wB9xE=DFrJ+Dr~cDQ{A{fNcO?I1
zC9l|jq{BondMbYXGqOy~-NrO&+g<b%Ch11ct+2m@O<7;{dABRldQecQ|F+*hTt)^G
z8>acx(omJ5fVA**OVZw;lf~1^qj&VxJ#{jG=mq^xw0)6|m%#_kB7fqMbah7%@QF;p
z2<PfpfT5bo41&Sw^LTRWInuk#NvxM@4Gs!_&ROCDIrY@$^eFLld&ao+5axE#&(Ow1
zgM-sBYj*qsBiaQzWs?^+*(FS|Rv_YA?N`ux`pF&w>_NAef6jhe=~}$Z!{Y*k|G>Sm
zWyx#g3RsA9W$*Rm_<sCy&VmlbLu6^`yciu>#IwGd5D>d)F)&@Xq$qzfSCW~t0IwPr
z$Ffy3+|j}C2GP6$roDiWr=W)OGozE`21b9@a9Boco1`NG0tf&Ef&|Esi!d!alwKAV
z2exns+s@S*xSgGsmj%Uf;N?xtM1=12*~rM5fJk{^la3h6te>7$d(<O-?IV&%Ua-iG
zCvot2m=W(mV>%Jf6#@J)ySi6JoB*9MH%|g08d?34CNde1QW%&8rczdeeM*|+fWm(e
zN#(_-{a^yX2MzS+K_Gd3as12=T^ILr@P|b}QSGN_08@+Lw3GcJ(Quw!m_5kvB{nbN
z-(^k9Jww3Q##h6yn$;oXL`&Ng2u(8}gO#Q~Rv7T8L=??MBVlg8T628C#|y2KrSW!-
zXOS}AWkrS!m{F}nX$iIyR2)0Th_Zjmt)8{mP_cR({lv=3p5hS7l`um@vB-K6p;N3d
zIB6uye`IN(e_7&9M{a(Rrd;RB#lz&ex}WIlrJDECR(})waYR;nWpT!;xg~uKx5v`2
z?ro2gAo~&8e+WoJ2M?ZqM-hqv9EuvL9chw~(wwNQoSy~K3<&mS1yJ<;joW{in!1pc
zB%?fj^&%4usb#W|@%fqS36g<QxCo5t2YhWRe4}e;C{YNFM~#vp-go}qa#%Ww`gyHX
zTBzV6nuezMA$_r1aH0mzaqGuu`$`m&64D-t>-WZO0pZ3a;fukq`XyCgRctnnN2a$I
z-+vf0iAN2cj_{fGr++j@YMg&HaFtj^v8JekBd(-zAid=f=;v&<dzi>p{W@({fbUb%
zkK@sdJCkC6sCjc*C-9O<*&8AuOips55z7?d%{GeldN^{Y1oL{(BZ8YIyoy~iHU8Cw
zrISlqFZ4lu5$EJKZ2vdU&=n>abrSlBpieaRLlvJDIO4Dc`1^xezpH;?uH0mO^J6GH
z^>?F-PBIG2Y`;Cfp-#NWZG;G(EosJsP`=3{IxgHBBLM39A?iUl3SapeE%v~YKK1HR
z{lKr}y=U%RK;VF5+&XkXN5PrBs?5%=&3hWbjdbF(HaiRwBt*PwI+H9CW&A%$GjH+P
zi%MlZLFRF$J&gS<Pep&O@DaY!Ht!u3f{ch-N!>^OdL4U*bLZ6(Cyu4vKF|@-BF(kr
zk)@cSC0?E0cp^8G`u?Mo-=CSRVY<~-i%Hf7rJLY0ZX2m9S|v$zQd4wKbH}@jEnbtG
zW9q1^W64{g`%Q9QqE>_#739S$s6anm+Xp+3b}0#6?TnFZCaHf~)K+oNk(}HfqK|-f
zG9h?0Z|NC&t0_B~NdS^nr1*8l99w3sm8@!pqjupy&b!F=W>t-~H}>weCr}OLb>?;C
z#SXnATE8s34)P;pXsIRk<jQMtQBO*CllXvI$2l)a4VSLR02b5<8sFA;hWZ9U;1Aiw
zd}b{!rP3l{Tj76-j-sgkDDo~SUYJ&HA8&#(<^9EgQJnbOKw>-Y&mGYZ6nv2F9u6w>
zK)O1XwNmiwj^VH#m+F2SgTHnXry?PaHvVPVht%TAd5BT2kSH;)MLoU!By8EADqU+i
zKT4=9Jkv$Fh#M=d8!~1?Seso-RkhENYZQ^R-3e=`?x10^6NspngMlM*-;r`?Zk=fr
z&o!zu)SB{@3Z2)eK}vE1zrf?&e5SEFjg)xDSoKHKV?<`#guJY8e5)bOSPxh(DEnhC
zIdo5ke#}?_`Ntg|MIt|27ej$5=XS!6v~GD+lLHJWMg>}Pz?xb@QUf^L`p1~G?RU~5
zwlFX-AutIB1uG5%0vZJX1QhY*OC%?%YWMCLee0;1&X-F1Y0v}+YJbIj32SXV0s#RL
Cqb!yH

diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 277abb93f..d212f340d 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -1,6 +1,6 @@
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.schema-name=royalpay_production
-spring.datasource.host=192.168.0.111:3306
+spring.datasource.host=192.168.0.18:3306
 spring.datasource.url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=root
diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
index 91173a856..3455edb96 100644
--- a/src/main/resources/application-local.properties
+++ b/src/main/resources/application-local.properties
@@ -1,6 +1,6 @@
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.schema-name=royalpay_production
-spring.datasource.host=192.168.0.49:3306
+spring.datasource.host=127.0.0.1:3306
 spring.datasource.url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=root
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 0fed0e0e5..106d12b60 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 server.port=5000
 
-spring.profiles.active=dev,alipay,bestpay,jd,wechat,rpay,yeepay,lakala
+spring.profiles.active=dev,alipay,bestpay,jd,wechat,rpay,yeepay
 
 env.company=RoyalPay
 
@@ -22,11 +22,11 @@ spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.database=1
 
-spring.data.mongodb.host=10.30.0.8
-spring.data.mongodb.port=27017
-spring.data.mongodb.database=admin
-spring.data.mongodb.username=mongouser
-spring.data.mongodb.password=Royalpay123
+#spring.data.mongodb.host=192.168.0.111
+#spring.data.mongodb.port=27017
+#spring.data.mongodb.database=admin
+#spring.data.mongodb.username=mongouser
+#spring.data.mongodb.password=Royalpay123
 
 mybatis.autosql.default-dialect=mysql
 
@@ -57,17 +57,23 @@ app.agreetemplate.classic.path=https://file.royalpay.com.au/open/2017/07/10/1499
 #app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2017/11/17/1510890355946_hQt6yGc0NJ8TYeK7XCuuSAnTI31M7v.pdf
 app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/02/12/1549950518019_vW4tU5t6D6yA0wMSDNBB9G195W3g99.pdf
 
-app.host.main=http://192.168.0.9:9003/
-app.host.regions.cn=https://mpay-cn.royalpay.com.au/
-app.host.regions.au=https://mpay-au.royalpay.com.au/
+#app.host.main=https://mpay.royalpay.com.au/
+#app.host.regions.cn=https://mpay-cn.royalpay.com.au/
+#app.host.regions.au=https://mpay-au.royalpay.com.au/
+app.host.main=http://192.168.0.8:9009/
+app.host.regions.cn=http://192.168.0.8:9009/
+app.host.regions.au=http://192.168.0.8:9009/
 app.debug=true
 
 app.name=RoyalPay
 
-app.cms.host=https://www.royalpay.com.au/
+#app.cms.host=https://www.royalpay.com.au/
+
+app.cms.host=http://127.0.0.1:9533
 
 app.server.ip=127.0.0.1
 
+
 app.redpack_auth.enable=false
 hf.rsa-file=/opt/2000604000101.pfx
 ##积分商城
@@ -88,8 +94,9 @@ app.mail.appid=1
 app.mail.host=https://mailsupport.royalpay.com.au
 mail.send.credentialCode=Fd1aRfdjc9
 
-apple.message.apns.password=F1b5*ChJPp73
-apple.message.apns.file=/opt/adn
+app.sandbox=true
+apple.message.apns.password=BSNMNkxPq0AT
+apple.message.apns.file=D:\\globalpay\\9009_manage_develop\\royalpay.manage\\src\\main\\resources\\apple_message_cert_product.p12
 android.message.secret=2b96d9bc6169c9554218aab1
 android.message.appkey=3f33a10d0a7d4ac94d8f2431
 
@@ -141,4 +148,4 @@ app.hanyin-secure.pid=ROYALPAY
 app.hanyin-secure.sftp-host=180.168.61.86
 app.hanyin-secure.sftp-port=28480
 app.hanyin-secure.sftp-username=royalpay
-app.hanyin-secure.sftp-pwd=royalpay
+app.hanyin-secure.sftp-pwd=royalpay
\ No newline at end of file
diff --git a/src/main/resources/jasper/partner_invoice_gst.jasper b/src/main/resources/jasper/partner_invoice_gst.jasper
index a5111a4faf1648300d179f1fecb47806aacba7f3..5fc26485f99e4b275f02acab26904d90f6f38177 100644
GIT binary patch
delta 15201
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
AYXATM

delta 15336
zcmeHO3tW}Owx1a`Y<2qpc|Y825CJifmna4*;REF%sHllv+`xvg?PdcT-?7beDm6Qa
zlS27GQZr2xqck6tUbF0U%1nQ!TOQNy?c9DnZtC^iJjXhD*UWst_aZHSr{Dek&V}DB
zX1=v%)_<*8-+XK4`*`f8;qnbb+v7vAH$8B~O!o}+p&t(|3kqCN<;b>GRX*UFUOmla
zt##$w78O`4ZS9Z5`(Q&|EgD8!2gS6%J?s#{2I@}AqB!}#>0gpdOw$oUxUL2@;2E?r
z-HcuIvmXY~O(`w~Cv#)4htt_WulR@4<0+oBc=&m2rwOU?^pmNP3dzRQ@CY{AY^Rft
zS_tEt>e&^QCVDN^e^M=DlrmD@B|bnc?%_f`s%y(_wIx;MPA8L|FQn~GNsFBpjEDd%
zVLrXpov9w8K3b`CGhJ8YpM!s^2g$6K2S`23>{T|0>nAW>D~e>8Xn2v=ZGF^Ft%1!3
zXbEZhEExOI%kOx_F<=|@(1mOITGK-O_5IYCHk4z!oOXLmKALd>6TLpm9D|?N!(q|L
zuiFq1+|7(RowRX72)#V2AD_4Wn!bAT=Bt$gL@Vz##~jfE6rmRPpov5Lg1SRQ6NUuS
z{j<HfgT|!a-a-EA@!6!&w)6opf6#*ysTTL35gESS!?FG*h>pzQaC`#PeRbnHP%8z1
zE@Xt{f2s#)pjsRPu8(bT*#lNbrLCma>aum?Dmrd-G@rI0^$5DKg0)frYie<548E#|
zD@r3jW{kf-lhoe$ZxqLJBq5qUdI1!wl}a~fxln+s*6OIUmbt2`9VM=+1-6o`DMk6y
zK_wx22nT7#`E*f$KEn2=#@@olK#XCra#8P_f%L$Amd<wJnIL-gzAPL_Q?d$xK9V&C
z=&7ve9%4l#f%JM-5nP%yZZ^;z<3<9#IBpWqnDH4M!!*4S0T)(|&+IAbLB90BHD7vZ
zd~D~H5PJ4n2#uSN43hscVGhuv6PT{=C!_#Pn0VH^%!Q0j>yibqsxiY$+kLY8kOA_Q
z9BIsMOf`>oAyYx-#PKEhMS1s)pXzL24zs$D*VOR^Q>HQ>cC7A`5L)ytJZ}&izFx%E
zY}!28JZSmtq?q%X8lzw-yfWD{;||0-pFUU*GcCvo=mQuH3^><KPvj1u>vC>?(|c&g
zgJ8zFeqI6<8_36?71DVydTOQ8%|R~Ii@TFYAbZ@ARUHTi-u5|S)Ekmc$@8DUW+ZD$
zZc$#o@HL}(jBrmq!fH*7>}KRBBkwVCiIHnSh(|*$N~f)X5$*5ho$=r|T@S4`9W#4s
zr8+VV_E00bYe1}~6C@#l-K|G=n~L~N_Rzi02dh!Q3i)f~BJ*6RU#+d8-cb(uMdw=N
z;m0OJoiD}dVC>o1xjT<tn0}YZ38YH_lcV(j4bcO1$Jx>^&P<rk%54j)%4`asjnsp9
zj~>L%&fWRUIFtL#=Pr^Jh#zH2=P_9i-%vF^di#{_muD>3XN5=4(Ss4MfpO;<-Q8p?
zEAJf;>*3HtG)#@?&Qm&{yGvHWqF3kvN>Br$|Il0olDXh19_#gxB&v}>to^)fE=)aw
zZZ@acpRufW4(MWeqr+zJTCR5J!Aw#s0hmUqYj-!^-{xBQ^G34|(*>yA4~euqEY{<o
z9-?FoqC3mWCzsrQ@2lB@@GZheB?F>Q>p@9TL!sT~m2|?q!Q3gDZH2B=G`T(pLabqh
zpXdP@t_A|L)UV8Lv({EQDog5IR#$ypH?!rWXMYn&AG3;$i#C_n%geR-G@G)x(vbXb
z^w6d1pzG6#j^*#&V578DY+Rz%Bj`FUMk|$WcDqpTTH69^?SoyB{-Yks5$fLHLod;@
z8+ef9c1S>;G0y6;*4bSAh9UlNkkX%}YQ!yad{zzN=O8E=vSZc^<4w}VH!JxTH9u0x
zk5coamHb%VbjuXPDFyCP4-l{5OZxy>|3n3!B&+)mSMo=&rn^BlK$=qEUiAPOO8yu%
zKU2xiQuD_v`4ge(22Xdnc#={eM?FBEl0QYwFI4iUsrf}p{!C}xXg1Yd0Pa@`6srfA
ztK^qZ^NJ8^si+&8rr7QoSe}G(7K`o`EObd#$KfD(kRGo{Duyr<2X3h7QS+hoEk71l
z?;2O+O5K^2$K`85K9FxGba#5PBSGDbq?_qn#v}O-Hh5gl{j;PW{%Pr`jxDJSsP693
zn*n`{57xOgyNk^uACAhf-R%~V54c5%?-y<z`JC+HL-8}ea$aToK@Sf`{27U1B#n_A
zM&>e7&B()yP)2q#a)^<47`ed6e=%|k2zjC79Jjs}4Jyuc*j({-74h?}bx!(ztZ(}>
z^RE$XZ(qCMgeR_}`E{e+43>eD1`*y15c;Z=g=Z(jEg07B7!a)bJr-&iET&Ou*L9Bu
zLj&#W3NbY>m0agin(VqKy=!Mc_<b+~mi%7)Y^lVx#Ay@PunYOd+iL2q_PW@}j;B`S
zV7l2A=hetG71P4@P`80)d4ep}F;Z}KjFdAJM#>oqBLzccqydyKrSt2f@KX9@{U1VG
zT*%W|wb*87sJ6))t#skS!l+&BIwv(cXa#ru@_~~@O^7Jq$r%cG5<^;gmUei&h9)$a
z>B2=beYD5IpDv2<V)hsu)N65+pB<j7JvuzyF<+w>7e}#UV*@7#bwCR)11)Mgpydn&
zXo;Z)eUQd2iH>dKfxzC4`03;bJv&}@B+-W(0<eRwThfgQA2j&Wi%T-1*ga+7<SiXD
z1ecj1YC2}f845EbhT4p`!1s}1U1oHhgd0SRv!m^x0W%=feL6#ZoUOFV6*+iJhs25E
zz%V9Z7!^4*lHW)jM4GyFOZ;fXGH?CqW45;}%ZOqp+XhZ9=-4i}%yv=Jv0ctk*e)^D
zwqH=$-nG${+iqr-_3yMjtJYTj^Nk<;&`%g&`cOvHb!I##S9OdRTxPte=@>6(D2$gF
zYU8gm<3ro(Krd$Tt9|3Jpdpm5Zs^Oy){pLO=+=U%QS8XglM%x$Eqc!IB<q()=15g7
zd<8=ezk{KMe@g{ldn9nx9ZY+zSc`qA&!7zA>D~Uv6&6o7%f1IQqh*QLub6!Er?AMr
zWdMG?<Xfa!Jo}b=;8#n&-C}>kvTwx{{94KP6!DNJkbNrw{M_VQ>Q6IQ&48CK&8x-&
z{dm=Ip#4^l2AaQm6wuYH*_Ag|rvm+M^}Rro*03uNtYL3|TGy}_Hh)}`1hnVljHW-H
z3ABON4{-YV<4khES~ljKwP`>%a{9qqHooZz7_B|?i8xXYi&W=R-HXT?o<F#d_Y{ZC
zGJb*6wZt;jRt8TcFy8ZfAc*C8UPvzfqpacODQkHCo!Xxa#<%F1C;fxE+g`K>tn(w-
zNr$WtznASIdh!M4|927aQHIV772Q`*-YhczkM1HkHu)}s7Ho(MU|)oI@QG&6N*pVy
zblrx~as0wyan~unCDFV~Vm%Ysxk<0O1y;L#dbP`HX9+o3POohk)t!#ajb@8l2RnNy
ztFCvr>ZJa-(7zWO=>;I3F50ru4iB~7O;LC*O>CNPDuc^joRm=O7T<8u77r=;u0zO_
z(afE`9o1`1zCn_>>IvmlLL-itGupT>*aKGc?%bey-P(~evA?Vrq`Zrpqk7L3*BQon
z^!es&6En(-69<PY+B$FrgTs}o46Y=uhU=g;PlqS(2iJ+Wy`8u<@8eat>6=g2U^h*D
zW(|Ino_OXf*k$b9G`4r69QI!~Wt%oI*ql%fTeNjx3kHWRRT*qaTn(Gj6Pv?eHb31Q
zrBvB>OSY+nspMn}S1H;$Dg}e9l&VanB(7Gug-xt1bJBi_;JwwKMsH0}0xI2FWO|VS
z;$#m8B-%QF1cL*Tstk}Mt_HM+j%<ksA5^xee9+XAYkHNb<m4b%DcU+J1%s=Us!XLM
zu2y+am40boIJ9mXNOQLb(m!qURr=xkZTH~4^lWpu=@f&;$w>}Pv~{2f28Sk988k^;
z4eca7-O9XiqgCaNm}hfMXP8P(-s37oTSui}aFtS(sg%UkD&JFiL;GSSaeD}OBTngw
zmD}f<E-^rye8K^Vwhkb{V1PV%m1ZvY4Hi8wNec$**in0ZLg($sRVsURM~B<LWGXrN
zf~yp59hHK?eIQlA2dR>{+6P~V`<+uzfEplkm^f{^Wt6m(ZQrSyj&nP6P1hL|POfn%
zqOAi(FgO&c3Qz(iaWxb=tYKheTOEwecQ%@LO^_XVRMxrZpP#G2h|b(q*ayCeWIqhe
zJSRU_J+rH{Zx31WW9&)CJYQ_;2O>sJJZa{uzFwkD8{2&+i>kmbKMoP%{RBh4wdr7}
z;2S+@=<Z3q<&dazcabTCspce*s}^mpT2ysZ%NYvQ5<{&zkWSbW0r$=Wd!m#8n)ei%
z1~CAfL~;P4%>jt24gfhr0YGA?0YtL3bwpd|+-bfzg}F01;k#Ietv0K=9NrGeerVy)
zA@u7P&f#i$Jl>z4-#ZO2r2XtOJOQ}DNjKRm=~w&O@nX95#R9y9UU_l3cYQ80+N&J4
z0-J*gEuzcz$0;p8uz$peWOiT(k8trLj-9$NYQ9tjj0SskWi?IQGJs~Z4Kj^lp5r8$
zHkyYSMST==otNOz*08S2;ZehSNFq*1R$^$uff-6rFCEA>u}^-CoaFH75N$T5TU2$X
zL(Wi4hs01%M~=+9kX6M@uV?RtEz=&TUSuhN%|x!N+yaN9<?t%eVy&}GtzKfa7g*`~
zmn=bf>~2Cn45U1io%HX|h0ym;jKZ^MczeEyeXU^Rq=;J~+T03J)v-d(P*@=`)K(NJ
ztw_kcFW-`wYDrB<w4^4cSyD$1hh34g)>a4K%UNAj3vHI_3QK0mglV~!l$4PPsi`a+
z4Gt*?{NS@U{)2<0fN*qUDyU^Xn8v!JqRppYzOgOz@`0Q4pZPfSyX?>D*#m=370i52
z%DMTX&F?8u)iGbrP?#?<)aIA7duni3ylTFghIs8IzUs-hF0iqq%7X5VU3o{w?rr~%
z$8Lrd#=JY-jceY#Z!kBO`N7CZ4L4S_xv`?EW2~H^FjiuyjjdtE-qU4l-+EArWuL5r
zvG9VKeej)GUJi3!2lo2YmAiat#>>9SyKK(OxhD3hh>?>9j#;!BX0xd3VCD?^S)FgN
z=(z#{fx+#3J{ue8;8zC0Iy>bR)jI2bCEK)yspMo8S1H=uO`@u!QqEAgNn)r0tWxE$
z+OO6hJ{UqbA5<-dA0Es#v2P2FoNVCmM4Q7CRULS8h60|%P{Z3mTMn7QKd&EB`RCh1
z*``(ofRh#uK(sjkQPlw;XD9$j3^jljm4Cd|VMMRKI*|Gu_63l!hgBeF9nLoGXCOJ*
z$3coV2PvvLAmt1NNQt2axsQR2ZeyW^*$z|lnLot3vD9j}I?8Oc;>dBFL}QLdVK~u0
z7J}!|%A+IjG1_u;4n9JEkX=tdHp1s5U+kC-C-{xVB!cOdW2VmDZ-Ug@8mZo|b&a3<
z+6dFTT@v(nuf=utKL1*g=^PuLlQY~!qRm|-syZ%`GZZe87-|=tp?hAR*r~P88$~?f
zHnI%bc!6u>)k{pPSyXkjat2Gd(?w5B!fm{ue8l+W*=pIBP%g`K>tf3!$HHp(n33N6
z*U#bKeJ-8M=%184a`?!E<dKQVDJ5wmhNmVawY#t6dA2Wm=fof*f0JbVnr2;z(-(Yl
zV9M7B#by2e$0M)9w8!JOjfh|rE?!So*sB+nBo5cApzbRvhZg$c_;B|_$OC>6sls`o
zd*E-m^dvLG-_=kyKxu`t56WREr=XmLauLdxP;S7t-v%iCp;(~ALrI4+8OkguWl(CM
zJOO1Bl-*E1fCBx9Cqi!G3zY~c!=Pk9$$@hJQM~bf!y(+9w+nwLtG^|yA7OP5A@ic_
z`m?g@8)etm$gVfUy^QuA#G8)e=`Enb=>fdiC1R{H;2q(-R$vuDYxY6B{WxZ=iO_1`
ztsT%xgVvl*-VkWnMXTwlQTSZb&J<ka#srN;2z`tQx`5WAOW@DTs2P0@KK(P=0Uq3k
zzCvy2Tk!1_bPQbw|NaG?Mt=n#{|%i-e+NJRh%Un@Ut$mR4K|`1xCgq4dt(FcgN@h+
z_lIA99Dpr25D&zmI39=LL};bs2s{S62jR&$8t36SJPQxO#dsJl!wI+or{Eeq9J_ED
zegcoe>+op23B<SJEW8_!!+UWy{s2$H=b+~eoR4qfsl*dcBR%j;;)`dI06d38;JG9U
zTgfn7N|JB|$-tFlEPjyWU^~gjPI5o4A#=QNJ*mVGHGK<*)Bn_=_WDnR8u0Ea)DoM@
zN8lS$sNqLp0a%6B;<ac4+;q*j5w+s=Xb0Yi_TeVf1~=hhycr$C+t4Z8icaI5=q!E?
zoyU97Mf?JU+I|SNHVCzsA=F-hP&*8vb_7E0bqKUKAk<DmaJ>nkb{azM9SF7eAk^Mx
zq4pt!8Vi_@Ak_X1LhVlwY8N5YK7&yEcL=rrgi!keLhWk^wQnHQu0p6?gHZb)2(|B^
z=S>K;?}6STo&=E|#6WzZ7C?HE2-1s0k-lUY=|_^_Y6kHmV@VLnA;Bb{3?TOtGlUw6
zB$XttX$rg<`KJ!Gf7GgW2v)UNEQJ|KMuZGUYe^c~Kt`cvG8(m#F=z+LLi@-#)JC$=
zVKNCFBYEf)$w#NjRCJb1L+8m%bdk(Lm&qLTC7Fx9Ay#yQl%kuY0vlkZFp>vxe`3e}
z#EC7W1`j0lIG!xTiDW5GC(G~{;&$W7WChM6zlC+^5nN1G<1(@a)}P<Odh;Z95sIH6
zPvLc>8E+y_<E>;1-c7dRz2sT^0ojhvkzM!(c^=;+dm*^?L6{wYfO-kS>>z~MAqcah
z5N5|9%#K5toq#Yq1!49UgxT*Q%-$t)hLAH5W*;Gp--2}=0@a25b)T^=lm!1+6Gn%f
L?AdfP9ryWPAP~x`

diff --git a/src/main/resources/jasper/partner_invoice_gst_bak.jasper b/src/main/resources/jasper/partner_invoice_gst_bak.jasper
new file mode 100644
index 0000000000000000000000000000000000000000..a5111a4faf1648300d179f1fecb47806aacba7f3
GIT binary patch
literal 80864
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
Q+ofmW#=m-fLv-x_0Y+VKc>n+a

literal 0
HcmV?d00001

diff --git a/src/main/resources/jasper/royalpay_logo.png b/src/main/resources/jasper/royalpay_logo.png
index b71a9e0510d2e792ae8dc20d4a723e1478860722..89fa0fe36554a48b57760ef9ad86b1829fa08f1e 100644
GIT binary patch
literal 11978
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

literal 1770
zcmV<G1{L{<P)<h;3K|Lk000e1NJLTq001!n002M;1^@s6v*Mq400001b5ch_0Itp)
z=>Px*q)9|URA>e5T6<_5MHs(W-)~VA!AGsJHr<(PF(N2vs(&enNF^#lebjjNcK4dp
z2R_jh6%`R05J80&A4Q=Gf}jP_`k-3DN5EDpMS~{6++%l-RN|va*Wb5$yV=dn?Cm9c
z$qG3bc5d#QncwgGX1@96+skBPe#~6wDHWBiHB|m;MPuI?8v9|krK0lh4V`^#>g@H3
zt~_h%idxpPm)QN8BVxj7Ud-CCVyUUI5<uInEqv6_loySHva)%U5j|`>(`Km37p(<f
zr<^HR{Y_F{1hn`+S$W<y&jbS2<`Y<Y58M4~j*O33AX(Pg0}DsOx6qg6T*ui0c=4LB
z`5sFF39`<whRV)ugu1P)ty*5ulsh2YJFcxbojOF2n1bwftlce57mW>Ij&}@=?}4W)
zq6C&uRGsfN3hgHgi4b@&{XDF3rKbUj--UzCqS4Yi&WA!C$NXbq3_?QhVv4rVG_=;x
zu~^@^A&FscAncn<ODel1ZoynPTLs=l;CHQ=-n1oEIT0KAd7L5t)Z>{ZWa>QU&Fwtl
zmtPTgh))8`;cxL6(-TMhK2Gkmio?zWRw*c#L4G8vk5R~;<H=_L;198Id=lt?NIXU?
z67GIb*<n&BMFs?}nCHtdreKA*W72-~Nyq`rGl|;f2DqO+FH}~QtATG)s34FwH)feb
zByA)JFhZQcv31!K2%xh^<lbv*YDo|gEc2HMpq=YH9^b|LLuY@IGsq-liLYqlL<^Qn
zInO(Z2=+>!Y-~7%wTY0hyStYRZ@T=rxP=ZZOIL27P#oY)89=ntnUJaG`Dv&N-7YLP
zkO&EyXtp0Lhjsw03W?BpQ9Gfb@y|pu*gu~xI0+(e7Pu|~NNrVJxrSumv9^e0V2J~%
zAVG1O2q3iq<T{6_#vT>R@X=I|un`LZ;FK7odtQNzgarGoA&FXGCh|NZq@g4}W}aom
z1mN*>eizLF54Bk$)0hOA8V3&6EV;SqQp&HqG6@0>K%K&Jv5U4eew9mtZ57GT3E$8X
zNdXm&<18bUJt+cLYcmfN+K-{W@J{<hautn#5<!CRfctu|6$RRR2;;tmOA)dgVhd0^
z<enn}k;@I)kq8p<!J{Tl?l(R<)VKOn#|oOVO*Ss>7T2Yf#32h2ED^wSH3$eJSy;1V
z_bW%Ikp%7)Y&{X6{eU`U8b#ib&X8wFE^Q<xaW%c$0p?<RO-2Ci)$!c&GaOlbnft9w
zqNxY~Ld`;cr$@llxE9%8RW^CDQI;5oxk^bF0JG%alu^&6B361qF2{CL<Q#*9d))hi
z303H9fX{zV3b3}E=!%L^T@-#-C`%H8gTW-rsWl{M@|xeL4J=w#`@IxDB7~W)^<TUS
zaH86#NI)Z3U^2=&P|QE4f~EO}H#suxA4*8r&TS2Xl;Ves7Z^^Jb$*-IKlFr9q$MKK
zm?AAUY%4-31OQjhE*S~5f8&8PHRb&p5y$O%?V;y<lORwY09g5J84*g?ker!Q&V$vi
z_4){(^G(9h>b>rpph}+KC?kP(-`xs<2OAfF1O;~62m@_k%>R>w$YBaOf>@>Xg&;w$
zv)t#tG@(n6gaqxcx23>?Kg@xIg%F{4Rz*{K_H`q0!-t;0Ff1W5iFD1fAYNg84kY~4
zzHs0s8gZ|<PeOu%JSP(vIb0e@l-FN;5^%_pXcGrFWY0`J2?7XfJSDRR_R!P+3ld|{
zHkQtWgosJjk`hV7a`M0-{C-J7!p6aPzb9AsOcRN!p1nYhhmH7`pqVV>o!lrkB6dp5
zI|VVp8r!ATaPQhX5xU%J_b)xx@0T_bRzX<>OtLUN7+?;1@Ao2Zb_-(((ylB~R%an(
z4jpTx%@Pel^q?i2x)bfDjfCJfR|h<35y~Xed+fi0jb0t?AAFnZJPL#E@!CR9RT=U(
zR)Q7GF&LUhe1#1V<9o3u@ZMM=2$r%?fL_z?N)Wq06tD;r$1;qBpDZyT7Z6_L9W9{W
zBmT?@RuF!C)D#}v)icEcyRgw8LIi^zq%a{t?EX;DY>!~R!14(z790B>r?ch$O-Cv?
zb5Ja$ygzHg6-p38srzQmDf#}((4DnI&+g7Fff;v51jFR;QY2yAb;Hp=Zh%FSh4C$6
zQ2r{^*&(7UH%T)PD*F)@xIWaWg<p#F9?$)EnkcQmyWx$`O<Fnc=QdY#RwyDAuxI|;
ztAzxDLl=A5SqMdL$4Yqu_wnx1#*T};3}H}ivA(E*MGY)!AblG64^+sy0bM_aZ~y=R
M07*qoM6N<$g3^L9IsgCw

diff --git a/src/main/resources/jasper/royalpay_logo_bak.png b/src/main/resources/jasper/royalpay_logo_bak.png
new file mode 100644
index 0000000000000000000000000000000000000000..b71a9e0510d2e792ae8dc20d4a723e1478860722
GIT binary patch
literal 1770
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
M07*qoM6N<$g3^L9IsgCw

literal 0
HcmV?d00001


From d5571a8b59e05b2e84a22aa50d5767002a631dd0 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Tue, 26 Mar 2019 14:43:10 +0800
Subject: [PATCH 19/38] =?UTF-8?q?BD=E8=A7=84=E5=88=99=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/bd_commission_config_dialog.html    | 15 ++++++++++-----
 .../config/bdprize/templates/bd_prize_root.html   |  6 +++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/ui/static/config/bdprize/templates/bd_commission_config_dialog.html b/src/main/ui/static/config/bdprize/templates/bd_commission_config_dialog.html
index 4c2514d4e..40c1b0585 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_commission_config_dialog.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_commission_config_dialog.html
@@ -68,9 +68,14 @@
                     </div>
                     <div class="box-body">
                         <ul class="small">
-                            <li>完成当月指标低于 51%，提成按照 0.005%提取</li>
-                            <li>完成当月指标高于 80%，提成按照 0.008%提取</li>
-                            <li>完成当月指标 100%，提成按照 0.01%</li>
+                            <!--<li>完成当月指标低于 51%，提成按照 0.005%提取</li>-->
+                            <!--<li>完成当月指标高于 80%，提成按照 0.008%提取</li>-->
+                            <!--<li>完成当月指标 100%，提成按照 0.01%</li>-->
+                            <li>享受墨尔本和悉尼两地部门流水总和提成</li>
+                            <li>完成当月指标，提成按照0.005%提取</li>
+                            <li>未完成当月指标，提成按照0.001%提取</li>
+                            <li>连续四个月未完成指标，撤职处理或回归原有职位</li>
+                            <li>销售总监任职后需将自己手头客户按照公司规定公平分配给客户专员，本人可挂靠50%,每个商户享受50%的流水提成</li>
                         </ul>
                     </div>
                     <div class="box-header with-border">
@@ -78,8 +83,8 @@
                     </div>
                     <div class="box-body">
                         <ul class="small">
-                            <li>完成月度指标，当月部门提成为该部门总流水的 0.01%</li>
-                            <li>未完成月度指标，当月部门提成为该部门总流水的 0.005%；</li>
+                            <li>完成月度指标，当月部门提成为该部门总流水的0.005%</li>
+                            <li>未完成月度指标，当月部门提成为该部门总流水的0.001%</li>
                         </ul>
                     </div>
                     <!--<div class="box-header with-border">
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
index c62fc935f..dc4b7f769 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
@@ -153,9 +153,9 @@
                 <h4>补充说明</h4>
                 <ul>
                     <li>按月度发放</li>
-                    <li>每月发放总提成额度的 80%，剩余 20%按照“年度考评分数比例”于每年年底即 12 月 25 日圣诞前发放</li>
-                    <li>提前离职者，20%提成不予发放</li>
-                    <li>年度考评（根据销管中心每月考评表打分制进行统计）按照考评分数对应比例发放 20%的占比部分，扣下部分如果第二年考评超出一定评分 110%可以补发；同样，如果年度考评分数超过 100 分按照同比例发放</li>
+                    <li>每月发放总提成额度的60%，剩余40%按照“年度考评分数比例”于每年年底即12 月25 日圣诞前发放</li>
+                    <li>提前离职者，40%提成不予发放</li>
+                    <li>年度考评（根据销管中心每月考评表打分制进行统计）按照考评分数对应比例发放40%的占比部分，扣下部分如果第二年考评超出一定评分110%可以补发；同样，如果年度考评分数超过100 分按照同比例发放</li>
                     <li>商户开通后连续 1 个月未产生流水的，上交主管，由主管重新分配</li>
                     <li>连续 2 个月不产生流水的商户，由销管部统一收回，重新分配</li>
                     <li>分配后的商户流水客户专员只能占一半</li>

From 759ac52efebe1136cef347a6a6bbd58b34f245f0 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 26 Mar 2019 14:50:51 +0800
Subject: [PATCH 20/38] =?UTF-8?q?add=20=E6=8F=90=E6=88=90=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appclient/core/ManageAppService.java      |   3 +-
 .../core/impls/ManageAppServiceImp.java       |  14 +
 .../appclient/web/ManageAppController.java    |   5 +
 .../dev/web/MangerAppRulesController.java     |  37 +
 .../merchants/beans/ClientRegisterInfo.java   |  18 +
 .../core/impls/ClientManagerImpl.java         |   9 +
 .../templates/app/bd_prize_rules.html         |  98 ++
 .../templates/app/org_prize_rules.html        |  65 ++
 .../static/commons/filters/commonFilters.js   |  34 +
 .../templates/org_commission_info.html        |  15 +-
 .../ui/static/data/client_offline_desc.json   |  54 +
 .../static/payment/partner/partner-manage.js  | 254 +++--
 .../partner/templates/add_partner.html        | 944 ++++++++++--------
 .../partner/templates/partner_detail.html     | 670 ++++++++++++-
 .../partner/templates/partner_edit.html       | 590 +++++++++++
 15 files changed, 2249 insertions(+), 561 deletions(-)
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/dev/web/MangerAppRulesController.java
 create mode 100755 src/main/resources/templates/app/bd_prize_rules.html
 create mode 100755 src/main/resources/templates/app/org_prize_rules.html
 create mode 100644 src/main/ui/static/data/client_offline_desc.json

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
index a80593140..a45b7110c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
@@ -60,9 +60,10 @@ public interface ManageAppService {
 
     List<JSONObject> getOrgPrizeList(JSONObject device);
 
-
     JSONObject getBdConfigKpi(JSONObject device);
 
     List<JSONObject>  getBdPrizeList(JSONObject device);
 
+    String getPrizeRulesUrl(JSONObject device);
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index 29e37f1df..2d9c56cf0 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -143,6 +143,7 @@ public class ManageAppServiceImp implements ManageAppService {
                 query.setQuickPass(true);
                 break;
         }
+        query.setOnlyMe(true);
         return clientManager.listClientsByApp(manager, query);
     }
 
@@ -372,4 +373,17 @@ public class ManageAppServiceImp implements ManageAppService {
         }
         return listBdPrizeLogByOne;
     }
+
+    @Override
+    public String getPrizeRulesUrl(JSONObject device) {
+        //todo 获取BD提成列表
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        if (manager.getIntValue("org_id") == 1) {
+            return "http://192.168.0.49:9002/app/rules/bd";
+        } else {
+            return "http://192.168.0.49:9002/app/rules/org";
+        }
+    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
index 81ac37fd0..83adccb81 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -168,4 +168,9 @@ public class ManageAppController {
         return manageAppService.getBdPrizeList(device);
     }
 
+    @RequestMapping(value = "/prize/rules", method = RequestMethod.GET)
+    public String getPrizeRulesUrl(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        return manageAppService.getPrizeRulesUrl(device);
+    }
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/MangerAppRulesController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/MangerAppRulesController.java
new file mode 100644
index 000000000..81a1ca326
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/MangerAppRulesController.java
@@ -0,0 +1,37 @@
+package au.com.royalpay.payment.manage.dev.web;
+
+import au.com.royalpay.payment.manage.bdprize.core.BDPrizeService;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@RequestMapping("/app/rules")
+public class MangerAppRulesController {
+
+    @Resource
+    private BDPrizeService bdPrizeService;
+
+    @RequestMapping(value = "/org", method = RequestMethod.GET)
+    public ModelAndView hrefOrgRules() {
+        ModelAndView view = new ModelAndView("app/org_prize_rules");
+        return view;
+    }
+
+    @RequestMapping(value = "/bd", method = RequestMethod.GET)
+    public ModelAndView hrefBdRules() {
+        ModelAndView view = new ModelAndView("app/bd_prize_rules");
+        return view;
+    }
+
+    @RequestMapping(value = "/bd/config", method = RequestMethod.GET)
+    public List<JSONObject> bdConfigRates() {
+        return bdPrizeService.getRateConfig();
+    }
+}
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
index 9f9f4d25e..8084f0237 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
@@ -76,6 +76,8 @@ public class ClientRegisterInfo {
     private String merchant_video_url;
     @JSONField(name = "store_name")
     private String storeName;
+    private String client_pay_type;
+    private String client_pay_desc;
 
     public JSONObject insertObject() {
         JSONObject res = (JSONObject) JSON.toJSON(this);
@@ -386,4 +388,20 @@ public class ClientRegisterInfo {
     public String getStoreName() {
         return storeName;
     }
+
+    public void setClient_pay_type(String client_pay_type) {
+        this.client_pay_type = client_pay_type;
+    }
+
+    public void setClient_pay_desc(String client_pay_desc) {
+        this.client_pay_desc = client_pay_desc;
+    }
+
+    public String getClient_pay_type() {
+        return client_pay_type;
+    }
+
+    public String getClient_pay_desc() {
+        return client_pay_desc;
+    }
 }
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 1166a2423..01422682a 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
@@ -676,6 +676,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             JSONObject clientConfig = new JSONObject();
             clientConfig.put("client_id", partner.getIntValue("client_id"));
             clientConfig.put("client_moniker", partner.getString("client_moniker"));
+            clientConfig.put("client_pay_type", partner.getString("client_pay_type"));
+            clientConfig.put("client_pay_desc", partner.get("client_pay_desc"));
+
             clientConfigService.save(clientConfig);
             permissionPartnerManagerImpl.permissionClientModuleSave(partner.getIntValue("client_id"), partner.getString("client_moniker"));
         } catch (Exception e) {
@@ -744,6 +747,12 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         clientMapper.update(updateInfo);
         saveOrUpdateMailList(updateInfo, client);
+        JSONObject clientConfig = new JSONObject();
+        clientConfig.put("client_id", clientId);
+        clientConfig.put("client_moniker", client.getString("client_moniker"));
+        clientConfig.put("client_pay_type", updateInfo.getString("client_pay_type"));
+        clientConfig.put("client_pay_desc", updateInfo.get("client_pay_desc"));
+        clientConfigMapper.update(clientConfig);
         clientInfoCacheSupport.clearClientCache(clientId);
     }
 
diff --git a/src/main/resources/templates/app/bd_prize_rules.html b/src/main/resources/templates/app/bd_prize_rules.html
new file mode 100755
index 000000000..31e8d1270
--- /dev/null
+++ b/src/main/resources/templates/app/bd_prize_rules.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Title</title>
+    <link href="https://cdn.bootcss.com/twitter-bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
+    <script type="text/javascript" src="//cdn.bootcss.com/angular.js/1.4.8/angular.min.js"></script>
+    <script type="text/javascript">
+        angular.module('bdRulesApp', []).controller('bdRulesCtrl', ['$scope', '$http', function ($scope, $http) {
+            $scope.kpiRanges = [{value: 1, label: '0-50%'}, {value: 2, label: '50%~80%'}, {value: 3, label: '80%~100%'},
+                {value: 4, label: '100%-120%'}, {value: 5, label: '>=120%'}];
+                $http.get('/app/rules/bd/config').then(function (resp) {
+                    $scope.bd_rate_configs = resp.data;
+                    $scope.kpi_ranges = [];
+                    var kpiStart = [];
+                    angular.forEach($scope.bd_rate_configs, function (cfg) {
+                        if (kpiStart.indexOf(cfg.kpi_range) < 0) {
+                            kpiStart.push(cfg.kpi_range);
+                            $scope.kpi_ranges.push(cfg);
+                        }
+                    })
+                })
+        }]);
+    </script>
+</head>
+<style>
+    .box-body ul {
+        margin: 0;
+        padding-left: 20px;
+    }
+
+    .box-body ul li {
+        margin-bottom: 15px;
+    }
+
+    .clear {
+        clear: both;
+    }
+
+</style>
+<body ng-app="bdRulesApp" ng-controller="bdRulesCtrl">
+<div class="box box-info">
+    <div class="box-header">提成规则</div>
+    <div class="box-body">
+        <h4>BD分级提成费率速查表</h4>
+        <div class="table-responsive">
+            <table class="table table-bordered table-hover">
+                <thead>
+                <tr>
+                    <th>BD Level</th>
+                    <th rowspan="2">KPI完成度</th>
+                    <th colspan="2">Junior BD</th>
+                    <th colspan="2">Intermediate BD</th>
+                    <th colspan="2">Senior BD</th>
+                </tr>
+                <tr>
+                    <th>费率</th>
+                    <th>0.6-0.79</th>
+                    <th>0.8-2.0</th>
+                    <th>0.6-0.79</th>
+                    <th>0.8-2.0</th>
+                    <th>0.6-0.79</th>
+                    <th>0.8-2.0</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr ng-repeat="range in kpi_ranges">
+                    <td ng-bind="'#'+($index+1)"></td>
+                    <td ng-bind="(kpiRanges|filter:{value:range.kpi_range})[0].label"></td>
+                    <td ng-repeat-start="level in [1,2,3] track by $index"
+                        ng-bind="(bd_rate_configs|filter:{kpi_range:range.kpi_range,bd_level:level,rate_from:0.6})[0].prize_rate+'%'"></td>
+                    <td ng-repeat-end
+                        ng-bind="(bd_rate_configs|filter:{kpi_range:range.kpi_range,bd_level:level,rate_from:0.8})[0].prize_rate+'%'"></td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+        <h4>补充说明</h4>
+        <ul>
+            <li>按月度发放</li>
+            <li>每月发放总提成额度的 80%，剩余 20%按照“年度考评分数比例”于每年年底即 12 月 25 日圣诞前发放</li>
+            <li>提前离职者，20%提成不予发放</li>
+            <li>年度考评（根据销管中心每月考评表打分制进行统计）按照考评分数对应比例发放 20%的占比部分，扣下部分如果第二年考评超出一定评分 110%可以补发；同样，如果年度考评分数超过 100 分按照同比例发放</li>
+            <li>商户开通后连续 1 个月未产生流水的，上交主管，由主管重新分配</li>
+            <li>连续 2 个月不产生流水的商户，由销管部统一收回，重新分配</li>
+            <li>分配后的商户流水客户专员只能占一半</li>
+            <li>离职及调岗人员商户统一上交销管中心，由销管中心 leader 及跨境事业部总监相互协商及相互监督，按照公平公正的原则， 做出分配方案，并由总监确认后统一分配。调岗人员移交的商户，在移交后 1 个月内移交人员和接收人员平分该商家产生的提成，移交人员需配合接收人员做好商户对接和短期内的商户维护；
+                离职人员交接的商户提成，接收人员享受一半的提成，另一半作为跨境客服专员福利会基金</li>
+            <li>被客户投诉情况严重者，此商户由销管中心无条件收回重新分配</li>
+            <li>活动执行未传达到位且出现舞弊、徇私、懒惰等行为的，商户上交由销管中心统一分配</li>
+            <li>后期维护不及时，连续一个月不跟踪者，此商户上交销管中心，统一重新分配</li>
+            <li>以上分配，销管中心 leader 和跨境支付事业部商量好之后需做好方案后经 COO 审批方可执行</li>
+        </ul>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/app/org_prize_rules.html b/src/main/resources/templates/app/org_prize_rules.html
new file mode 100755
index 000000000..fd5e09c30
--- /dev/null
+++ b/src/main/resources/templates/app/org_prize_rules.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Title</title>
+    <link href="https://cdn.bootcss.com/twitter-bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
+</head>
+<style>
+    .box-body ul {
+        margin: 0;
+        padding-left: 20px;
+    }
+
+    .box-body ul li {
+        margin-bottom: 15px;
+    }
+
+    .clear {
+        clear: both;
+    }
+
+</style>
+<body>
+<div>
+    <section class="content">
+        <div class="box box-info">
+            <div class="box-body container">
+                <div style="margin-left: -5px" class="box-row">
+                    <h5 style="float:left">合伙人提成计算说明</h5>
+                    <p style="float: right;color:#cccccc">2018-11-30更新</p>
+                    <div class="clear"></div>
+                </div>
+                <div style="padding-left: 20px;margin-bottom: 20px">
+                    合伙人提成算法：按照合伙人签约的商户下每笔订单计算合伙人提成，提成规则明细如下: &nbsp&nbsp
+                    <span style="color:orange">(取整规则为：四舍五入保留2位小数)</span>
+                </div>
+                <ul>
+                    <li>单笔订单 :&nbsp&nbsp(单笔订单交易金额 * 商家签约费率)<span style="color:orange">取整</span> &nbsp&nbsp&nbsp -
+                        &nbsp&nbsp（单笔订单交易金额 * 组织成本费率)<span style="color:orange">取整</span> &nbsp&nbsp&nbsp
+                        = &nbsp&nbsp&nbsp单笔订单合伙人提成
+                    </li>
+                    <li>总交易额 : &nbsp合伙人签约的商户累计交易额</li>
+                    <li>平台手续费：合伙人签约的商户（单笔订单交易金额 * 组织成本费率)<span style="color:orange">取整</span> 累加</li>
+                    <li>合伙人提成： 每笔订单合伙人提成累加</li>
+                </ul>
+                <div style="width:100%;background:#cccccc;height:1px;margin-bottom: 20px"></div>
+                <div style="padding-left: 20px;margin-bottom: 20px">如合伙人存在二级代理，可从二级代理的交易额中得到分润，分润规则如下：</div>
+                <ul>
+                    <li>二级代理合伙人提成计算规则如同一级代理，分润从平台手续费中扣除。</li>
+                    <li>如A合伙人与平台签约组织成本费率为1.5%，A合伙人的二级代理B的签约组织成本费率为1.8%，B的商户签约费率为3%</li>
+                    <li>假设B当月只有一笔交易且交易额为1000，总手续费为30，平台手续费为18，B合伙人提成为12。</li>
+                    <li>计算A的分润时，会将B的交易额1000 * A的组织成本费率 1.5% = 15，A的分润就是 18-15=3，而B合伙人平台手续费为15，其中扣除3是A的分润</li>
+                </ul>
+                <h5>补充说明</h5>
+                <ul style="color:orange;font-size: 13px">
+                    <li style="margin-bottom: 10px">退款成功的订单不计入合伙人提成内</li>
+                    <li>当本月有合伙人手续费存在欠款时，无法下载汇款文件</li>
+                </ul>
+            </div>
+        </div>
+    </section>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/ui/static/commons/filters/commonFilters.js b/src/main/ui/static/commons/filters/commonFilters.js
index 609130527..7361abf79 100644
--- a/src/main/ui/static/commons/filters/commonFilters.js
+++ b/src/main/ui/static/commons/filters/commonFilters.js
@@ -45,6 +45,17 @@ define(['../app', 'jquery'], function (app, $) {
 
         }
     });
+    var offlineDesc = [];
+    $.ajax({
+        url: '/static/data/client_offline_desc.json',
+        method: 'GET',
+        async: false,
+        dataType: 'json',
+        success: function (data) {
+            offlineDesc = data;
+
+        }
+    });
 
     app.filter('partner_state', ['stateMap', function (stateMap) {
         return function (stateValue) {
@@ -163,6 +174,29 @@ define(['../app', 'jquery'], function (app, $) {
 
     }]);
 
+    app.filter('partner_offline_desc', ['$http', function ($http) {
+        return function (industryCode) {
+            var industryLabel = '';
+            angular.forEach(offlineDesc, function (category) {
+                if (category.value == industryCode) {
+                    industryLabel = category.label;
+                }
+                angular.forEach(category.children, function (categoryChildren1) {
+                    if (categoryChildren1.value == industryCode) {
+                        industryLabel = categoryChildren1.label;
+                    }
+                    angular.forEach(categoryChildren1.children, function (categoryChildren2) {
+                        if (categoryChildren2.value == industryCode) {
+                            industryLabel = categoryChildren2.label;
+                        }
+                    });
+                });
+            });
+            return industryLabel;
+        }
+
+    }]);
+
     app.filter('partner_sector', ['sectorMap', function (sectorMap) {
         return function (sectorValue) {
             var sectorLabel = '';
diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_info.html b/src/main/ui/static/config/orgcommission/templates/org_commission_info.html
index 2370ed76b..d9cb4c525 100644
--- a/src/main/ui/static/config/orgcommission/templates/org_commission_info.html
+++ b/src/main/ui/static/config/orgcommission/templates/org_commission_info.html
@@ -2,12 +2,15 @@
     <section class="content">
         <div class="box box-info">
             <div class="box-body">
-                <h4>合伙人提成计算说明</h4>
+                <div class="row">
+                    <p style="float: left;font-size: 17px">合伙人提成计算说明</p>
+                    <p style="float: right">2018-11-30更新</p>
+                </div>
+                <div class="row">
+                    合伙人提成算法：按照合伙人签约的商户下每笔订单计算合伙人提成，提成规则明细如下: &nbsp&nbsp
+                    <span style="color:red">(取整规则为：四舍五入保留2位小数)</span>
+                </div>
                 <ul>
-                    <li>2018-11-30更新</li>
-                    <li>合伙人提成算法：按照合伙人签约的商户下每笔订单计算合伙人提成，提成规则明细如下: &nbsp&nbsp
-                        <span style="color:red">(取整规则为：四舍五入保留2位小数)</span>
-                    </li>
                     <li>单笔订单 :&nbsp&nbsp(单笔订单交易金额 * 商家签约费率)<span style="font-size: 1px;color:red">取整</span> &nbsp&nbsp&nbsp  -  &nbsp&nbsp（单笔订单交易金额 * 组织成本费率)<span style="font-size: 1px;color:red">取整</span> &nbsp&nbsp&nbsp
                         = &nbsp&nbsp&nbsp单笔订单合伙人提成</li>
                     <li>总交易额 :  &nbsp合伙人签约的商户累计交易额</li>
@@ -19,8 +22,6 @@
                     <li>如A合伙人与平台签约组织成本费率为1.5%，A合伙人的二级代理B的签约组织成本费率为1.8%，B的商户签约费率为3%</li>
                     <li>假设B当月只有一笔交易且交易额为1000，总手续费为30，平台手续费为18，B合伙人提成为12。</li>
                     <li>计算A的分润时，会将B的交易额1000 * A的组织成本费率 1.5% = 15，A的分润就是 18-15=3，而B合伙人平台手续费为15，其中扣除3是A的分润</li>
-
-
                 </ul>
                 <h4>补充说明</h4>
                 <ul style="color:red">
diff --git a/src/main/ui/static/data/client_offline_desc.json b/src/main/ui/static/data/client_offline_desc.json
new file mode 100644
index 000000000..777877860
--- /dev/null
+++ b/src/main/ui/static/data/client_offline_desc.json
@@ -0,0 +1,54 @@
+[
+  {
+    "children": [
+      {
+        "children": [],
+        "label": "立牌",
+        "value": "qrcode"
+      },
+      {
+        "children": [],
+        "label": "POS",
+        "value": "pos"
+      }
+    ],
+    "label": "门店",
+    "value": "1"
+  },
+  {
+    "children": [
+      {
+        "children": [],
+        "label": "ipos",
+        "value": "ipos"
+      },
+      {
+        "children": [],
+        "label": "银豹",
+        "value": "pospal"
+      },
+      {
+        "children": [],
+        "label": "aupos",
+        "value": "aupos"
+      },
+      {
+        "children": [],
+        "label": "其他",
+        "value": "other"
+      }
+    ],
+    "label": "收银系统",
+    "value": "2"
+  },{
+    "children": [
+      {
+        "children": [],
+        "label": "无门店",
+        "value": "no-store"
+      }
+    ],
+    "label": "其他",
+    "value": "3"
+  }
+]
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 082fbc03b..aa74df360 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -30,6 +30,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         {code: 2, label: 'Manager'},
         {code: 3, label: 'Cashier'}
     ];
+
     var wxMerchantIndustries = [
         {
             "label": "鞋包服饰|Shoes&Garments",
@@ -361,7 +362,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
 
             };
         }]);
-    app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone','businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) {
+    app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', 'businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) {
         if ($scope.partner_application) {
             $scope.partner = angular.copy($scope.partner_application);
             delete $rootScope.partner_application;
@@ -382,6 +383,12 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.bd_citys = angular.copy(bd_city_map);
         $scope.params = {textType: 'all', org_name: 'ALL'};
 
+
+        $scope.onOfflineDescSelect = function (selectedItem) {
+            $scope.partner.offline_label = selectedItem.label;
+            $scope.partner.client_offline_desc = selectedItem.value;
+        };
+
         function remove(arr, val) {
             if (angular.isArray(arr)) {
                 for (var i = arr.length; i--;) {
@@ -393,6 +400,12 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             }
             return arr;
         }
+        $scope.loadOfflineDesc = function () {
+            $http.get('/static/data/client_offline_desc.json').then(function (resp) {
+                $scope.client_offline_select = resp.data;
+            })
+        };
+        $scope.loadOfflineDesc();
 
         var industries = angular.copy($scope.industries);
         $scope.industries = remove(industries, 331);
@@ -504,7 +517,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 alert("Logo is necessary!");
                 return;
             }
-            if($scope.partner.partner_type == 'photo'){
+            if ($scope.partner.partner_type == 'photo') {
                 if (!$scope.partner.company_photo) {
                     alert('Shop Photo1 is necessary');
                     return;
@@ -523,10 +536,20 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     }
                 })
             }
+            // if ($scope.partner.client_pay_type =='online' || $scope.partner.client_pay_type =='all') {
+            //     if (!$scope.partner.online_website && !$scope.partner.online_public_account && !$scope.partner.online_mini_program && !$scope.partner.online_app) {
+            //         alert('线上支付场景至少填写一种方式');
+            //         return;
+            //     }
+            // }
             // if(!window.frames['merchant_detail'].merchant_location){
             //     alert("Please Locate Merchant's Location");
             //     return;
             // }
+            if ($scope.params.client_pay_type==''){
+                alert('请选择商户支付场景')
+            }
+
             $http.post('/sys/partners', $scope.partner).then(function (resp) {
                 commonDialog.alert({title: 'Success', content: 'Register new partner successfully', type: 'success'});
                 $scope.updateMerchantLocation();
@@ -618,15 +641,15 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.isComplianceOfShortName = false;
         $scope.isComplianceOfBusinessStructure = false;
         var website = partner.data.company_website;
-        if (website!=null){
-            if (website.indexOf('http')!=0){
-                $scope.partner.company_website= 'http://'+angular.copy(website);
+        if (website != null) {
+            if (website.indexOf('http') != 0) {
+                $scope.partner.company_website = 'http://' + angular.copy(website);
             }
         }
         $scope.decideCompliance = function (name) {
-            var keywords = ['education','financial' ,'train','immigrant','invest',
-                '律师咨询','会计事务所', '移民', '留学','娱乐','金融','地产','投资'];
-            for(var i = 0; i < keywords.length; i++){
+            var keywords = ['education', 'financial', 'train', 'immigrant', 'invest',
+                '律师咨询', '会计事务所', '移民', '留学', '娱乐', '金融', '地产', '投资'];
+            for (var i = 0; i < keywords.length; i++) {
                 if (name.indexOf(keywords[i]) != -1) {
                     return true;
                 }
@@ -655,12 +678,12 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         };
         $scope.showFile();
         $scope.passClient = function () {
-            if(!$scope.partner.wechat_institution_merchant_id){
+            if (!$scope.partner.wechat_institution_merchant_id) {
                 commonDialog.alert({title: 'info', content: 'HF Institution Merchant Id not Refresh', type: 'info'});
                 return;
             }
             if ($scope.partner.enable_hf) {
-                if($scope.partner.hfindustry == null){
+                if ($scope.partner.hfindustry == null) {
                     alert("已开启HF支付通道，HF行业不可为空!");
                     return;
                 }
@@ -698,7 +721,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     info.push('Business Structure');
                 }
                 title = 'Warning';
-                contentHtml = $sce.trustAsHtml('本次提交的商户[' + $scope.partner.company_name + '],<span style="color: red">'+ info.toString() +'</span>存在微信渠道不合规信息');
+                contentHtml = $sce.trustAsHtml('本次提交的商户[' + $scope.partner.company_name + '],<span style="color: red">' + info.toString() + '</span>存在微信渠道不合规信息');
                 choises = [{label: '取消', className: 'btn-danger', key: '2', dismiss: true},
                     {label: '确认提交', className: 'btn-success', key: '1'}];
                 content = '';
@@ -731,8 +754,12 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             });
         };
         $scope.pass2GreenChannel = function () {
-            if(!$scope.partner.wechat_institution_merchant_id){
-                commonDialog.alert({title: 'info', content: 'Wechat Institution Merchant Id not Refresh', type: 'info'});
+            if (!$scope.partner.wechat_institution_merchant_id) {
+                commonDialog.alert({
+                    title: 'info',
+                    content: 'Wechat Institution Merchant Id not Refresh',
+                    type: 'info'
+                });
                 return;
             }
             commonDialog.confirm({
@@ -787,7 +814,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
 
         };
         $scope.Export = function () {
-            var url = '/dev/' + $scope.partner.client_moniker +'/export/aggregate/agreepdf' ;
+            var url = '/dev/' + $scope.partner.client_moniker + '/export/aggregate/agreepdf';
             return url;
         }
         $scope.uploadAgreeFile = function (file) {
@@ -1037,7 +1064,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             if (!$scope.partner) {
                 return;
             }
-            if(!$state.is('partners.detail')){
+            if (!$state.is('partners.detail')) {
                 $scope.init.wechat_compliance = false;
                 return;
             }
@@ -1059,7 +1086,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             if (!$scope.partner) {
                 return;
             }
-            if(!$state.is('partners.detail')){
+            if (!$state.is('partners.detail')) {
                 $scope.init.local_merchant = false;
                 return;
             }
@@ -1096,6 +1123,18 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             var origin_referrer_id = angular.copy($scope.partner.referrer_id);
             $scope.partner.partner_type = $scope.partner.website ? 'website' : 'photo';
 
+            $scope.loadOfflineDesc = function () {
+                $http.get('/static/data/client_offline_desc.json').then(function (resp) {
+                    $scope.client_offline_select = resp.data;
+                })
+            };
+            $scope.loadOfflineDesc();
+
+            $scope.onOfflineDescSelect = function (selectedItem) {
+                $scope.partner.offline_label = selectedItem.label;
+                $scope.partner.client_offline_desc = selectedItem.value;
+            };
+
             $scope.listReferrers = function () {
                 $http.get('/sys/orgs/referrer').then(function (resp) {
                     $scope.referrers = resp.data;
@@ -1170,7 +1209,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     alert('suburb can not contain two and more continuous space characters');
                     return;
                 }
-                if($scope.partner.partner_type == 'photo'){
+                if ($scope.partner.partner_type == 'photo') {
                     if (!$scope.partner.company_photo) {
                         alert('Shop Photo1 is necessary');
                         return;
@@ -1198,10 +1237,19 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 if (!origin_referrer_id && $scope.partner.referrer_id) {
                     content = 'Update partner info successfully,But You Had add new Referrer,Please Change the BD Commission Proportion!';
                 }
+                // if ($scope.partner.client_pay_type =='online' || $scope.partner.client_pay_type =='all') {
+                //     if (!$scope.partner.online_website && !$scope.partner.online_public_account && !$scope.partner.online_mini_program && !$scope.partner.online_app) {
+                //         alert('线上支付场景至少填写一种方式');
+                //         return;
+                //     }
+                // }
                 // if(!window.frames['merchant_detail'].merchant_location){
                 //     alert("Please Locate Merchant Location!");
                 //     return;
                 // }
+                if ($scope.params.client_pay_type==''){
+                    alert('请选择商户支付场景')
+                }
                 $http.put('/sys/partners/' + $scope.partner.client_moniker, $scope.partner).then(function () {
                     if (content != '') {
                         commonDialog.alert({
@@ -1305,34 +1353,34 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 }
             }
         }]);
-    app.controller('partnerPaymentInfoCtrl', ['$scope', '$http', '$state', 'commonDialog','$uibModal', '$sce', function ($scope, $http, $state, commonDialog,$uibModal, $sce) {
-        $scope.copyHfLink = function() {
-            var e=document.getElementById("cpbt");
+    app.controller('partnerPaymentInfoCtrl', ['$scope', '$http', '$state', 'commonDialog', '$uibModal', '$sce', function ($scope, $http, $state, commonDialog, $uibModal, $sce) {
+        $scope.copyHfLink = function () {
+            var e = document.getElementById("cpbt");
             e.select();
             var successful = document.execCommand("Copy");
             if (successful) {
                 commonDialog.alert({title: 'Success', content: '已复制到剪切板!', type: 'success'});
-            }else {
+            } else {
                 commonDialog.alert({title: 'Error', content: '您的浏览器不支持!', type: 'error'});
             }
         };
-        $scope.copyYeepayLink = function() {
-            var e=document.getElementById("cpyeepay");
+        $scope.copyYeepayLink = function () {
+            var e = document.getElementById("cpyeepay");
             e.select();
             var successful = document.execCommand("Copy");
             if (successful) {
                 commonDialog.alert({title: 'Success', content: '已复制到剪切板!', type: 'success'});
-            }else {
+            } else {
                 commonDialog.alert({title: 'Error', content: '您的浏览器不支持!', type: 'error'});
             }
         };
-        $scope.copyCBBankPayLink = function() {
-            var e=document.getElementById("cpcbbankpay");
+        $scope.copyCBBankPayLink = function () {
+            var e = document.getElementById("cpcbbankpay");
             e.select();
             var successful = document.execCommand("Copy");
             if (successful) {
                 commonDialog.alert({title: 'Success', content: '已复制到剪切板!', type: 'success'});
-            }else {
+            } else {
                 commonDialog.alert({title: 'Error', content: '您的浏览器不支持!', type: 'error'});
             }
         };
@@ -1362,7 +1410,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 size: 'lg',
                 resolve: {
                     logs: ['$http', function ($http) {
-                        return $http.get('/sys/partners/'+$scope.partner.client_moniker+'/get_sub_merchant_id_logs');
+                        return $http.get('/sys/partners/' + $scope.partner.client_moniker + '/get_sub_merchant_id_logs');
                     }]
                 }
             }).result.then(function () {
@@ -1528,7 +1576,19 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 })
             })
         };
-        $scope.init = {jsapi: false, gateway: false, offline: false, refund: false,common_sub_merchant_id:false, channel: {},gateway_alipay_online:false,hf_Link:false,enable_hf_email_notice:false,enable_yeepay_link:false,enable_yeepay_email_notice:false};
+        $scope.init = {
+            jsapi: false,
+            gateway: false,
+            offline: false,
+            refund: false,
+            common_sub_merchant_id: false,
+            channel: {},
+            gateway_alipay_online: false,
+            hf_Link: false,
+            enable_hf_email_notice: false,
+            enable_yeepay_link: false,
+            enable_yeepay_email_notice: false
+        };
         $scope.switchCommonSubMerchantId = function () {
             if (!$scope.paymentInfo) {
                 return;
@@ -1549,9 +1609,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         };
         var info = [];
         $scope.decideCompliance = function (name) {
-            var keywords = ['education','financial' ,'train','immigrant','invest',
-                '律师咨询','会计事务所', '移民', '留学','娱乐','金融','地产','投资'];
-            for(var i = 0; i < keywords.length; i++){
+            var keywords = ['education', 'financial', 'train', 'immigrant', 'invest',
+                '律师咨询', '会计事务所', '移民', '留学', '娱乐', '金融', '地产', '投资'];
+            for (var i = 0; i < keywords.length; i++) {
                 if (name.indexOf(keywords[i]) != -1) {
                     return true;
                 }
@@ -1560,17 +1620,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         };
         $scope.getComplianceInfo = function () {
             if ($scope.paymentInfo.company_name != null) {
-                if($scope.decideCompliance($scope.paymentInfo.company_name)) {
+                if ($scope.decideCompliance($scope.paymentInfo.company_name)) {
                     info.push('Company Name');
                 }
             }
             if ($scope.paymentInfo.short_name != null) {
-                if($scope.decideCompliance($scope.paymentInfo.short_name)) {
-                   info.push('Short Name');
+                if ($scope.decideCompliance($scope.paymentInfo.short_name)) {
+                    info.push('Short Name');
                 }
             }
             if ($scope.paymentInfo.business_structure != null) {
-                if($scope.decideCompliance($scope.paymentInfo.business_structure)) {
+                if ($scope.decideCompliance($scope.paymentInfo.business_structure)) {
                     info.push('Business Structure');
                 }
             }
@@ -1591,7 +1651,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 && $scope.paymentInfo.open_status == 5 && info.length > 0) {
                 commonDialog.confirm({
                     title: "Warning",
-                    contentHtml: $sce.trustAsHtml('本次提交的商户[' + $scope.partner.company_name + '],<span style="color: red">'+ info.toString() +'</span>存在微信渠道不合规信息')
+                    contentHtml: $sce.trustAsHtml('本次提交的商户[' + $scope.partner.company_name + '],<span style="color: red">' + info.toString() + '</span>存在微信渠道不合规信息')
                 }).then(function () {
                     $scope.saveChannel(channel);
                 })
@@ -1640,16 +1700,16 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             if (!$scope.paymentInfo) {
                 return;
             }
-            var channelLink = 'enable_'+channel+'_link';
+            var channelLink = 'enable_' + channel + '_link';
             if (!$scope.init[channelLink]) {
                 $scope.init[channelLink] = true;
                 return;
             }
-            $http.put('/sys/partners/' + $scope.partner.client_moniker + '/'+channel, {allow: $scope.paymentInfo[channelLink]}).then(function () {
+            $http.put('/sys/partners/' + $scope.partner.client_moniker + '/' + channel, {allow: $scope.paymentInfo[channelLink]}).then(function () {
                 $scope.loadPartnerPaymentInfo();
             }, function (resp) {
                 commonDialog.alert({
-                    title: 'Failed to change '+channelLink+' permission status',
+                    title: 'Failed to change ' + channelLink + ' permission status',
                     content: resp.data.message,
                     type: 'error'
                 });
@@ -1692,7 +1752,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 title: 'Confirm',
                 content: content
             }).then(function () {
-                $http.put('/sys/partners/'+ $scope.partner.client_moniker + '/cb_bankpay/'+ key +'/channel_id', {channel_id: channel}).then(function (resp) {
+                $http.put('/sys/partners/' + $scope.partner.client_moniker + '/cb_bankpay/' + key + '/channel_id', {channel_id: channel}).then(function (resp) {
                     commonDialog.alert({type: 'success', title: 'Success', content: '修改成功'});
                     $scope.loadPartnerPaymentInfo();
                 }, function (resp) {
@@ -1705,16 +1765,16 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             if (!$scope.paymentInfo) {
                 return;
             }
-            var channelNotice = 'enable_'+channel+'_email_notice';
+            var channelNotice = 'enable_' + channel + '_email_notice';
             if (!$scope.init[channelNotice]) {
                 $scope.init[channelNotice] = true;
                 return;
             }
-            $http.put('/sys/partners/' + $scope.partner.client_moniker + '/'+channel+'/email_notice', {allow: $scope.paymentInfo[channelNotice]}).then(function () {
+            $http.put('/sys/partners/' + $scope.partner.client_moniker + '/' + channel + '/email_notice', {allow: $scope.paymentInfo[channelNotice]}).then(function () {
                 $scope.loadPartnerPaymentInfo();
             }, function (resp) {
                 commonDialog.alert({
-                    title: 'Failed to change '+channelNotice+' permission status',
+                    title: 'Failed to change ' + channelNotice + ' permission status',
                     content: resp.data.message,
                     type: 'error'
                 });
@@ -1938,7 +1998,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
 
     }]);
     app.controller('clientSubMerchantIdLogCtrl', ['$scope', '$http', 'logs', function ($scope, $http, logs) {
-      $scope.logs = logs.data;
+        $scope.logs = logs.data;
     }]);
     app.controller('partnerSubCtrl', ['$scope', '$http', '$uibModal', function ($scope, $http, $uibModal) {
         $scope.newSubClient = function () {
@@ -1964,9 +2024,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.loadSubClients();
 
     }]);
-    app.controller('partnerRatesCtrl', ['$scope', '$rootScope', '$http', '$uibModal', 'commonDialog','$sce', function ($scope, $rootScope, $http, $uibModal, commonDialog,$sce) {
+    app.controller('partnerRatesCtrl', ['$scope', '$rootScope', '$http', '$uibModal', 'commonDialog', '$sce', function ($scope, $rootScope, $http, $uibModal, commonDialog, $sce) {
         $scope.bankCtrl = {edit: true, rate_name: 'Wechat'};
-        $scope.init = {skip_clearing:false,tax_in_surcharge:false,customer_tax_free:false,allow_surcharge_credit:false};
+        $scope.init = {
+            skip_clearing: false,
+            tax_in_surcharge: false,
+            customer_tax_free: false,
+            allow_surcharge_credit: false
+        };
         $scope.getBankAccount = function () {
             $http.get('/sys/partners/' + $scope.partner.client_moniker + '/bank_account').then(function (resp) {
                 $scope.bankaccount = resp.data;
@@ -1979,7 +2044,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     title: 'Warning',
                     content: '启用收支分离模式清算将使消费者支付手续费模式失效，请确认是否切换？'
                 }).then(function () {
-                    $http.put('/sys/partners/' + $scope.partner.client_moniker + '/surcharge_mode', {surcharge_mode:'distributed'}).then(function () {
+                    $http.put('/sys/partners/' + $scope.partner.client_moniker + '/surcharge_mode', {surcharge_mode: 'distributed'}).then(function () {
                         commonDialog.alert({title: 'Success', content: '已切换为收支分离模式', type: 'success'});
                         $scope.partner.surcharge_mode = 'distributed';
                         $scope.getBalance();
@@ -1987,12 +2052,12 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                         commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
                     })
                 })
-            }else {
+            } else {
                 commonDialog.confirm({
                     title: 'Warning',
                     content: '请确认是否切换成净值清算模式？'
                 }).then(function () {
-                    $http.put('/sys/partners/' + $scope.partner.client_moniker + '/surcharge_mode', {surcharge_mode:'balance'}).then(function () {
+                    $http.put('/sys/partners/' + $scope.partner.client_moniker + '/surcharge_mode', {surcharge_mode: 'balance'}).then(function () {
                         commonDialog.alert({title: 'Success', content: '已切换为净值清算模式', type: 'success'});
                         $scope.partner.surcharge_mode = 'balance';
                     }, function (resp) {
@@ -2033,7 +2098,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             if (!skipClearing) {
                 commonDialog.confirm({
                     title: 'Warning',
-                     content: 'This operation will switch skip clearing status. Are you sure?'
+                    content: 'This operation will switch skip clearing status. Are you sure?'
                 }).then(function () {
                     commonDialog.inputText({title: '请输入关闭跳过清算的原因'}).then(function (text) {
                         $http.put('/sys/partners/' + $scope.partner.client_moniker + '/skip_clearing', {
@@ -2044,7 +2109,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                         });
                     });
                 })
-            }else{
+            } else {
                 commonDialog.confirm({
                     title: 'Warning',
                     content: 'This operation will switch skip clearing status. Are you sure?',
@@ -2137,10 +2202,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         };
         $scope.getRates();
         $scope.saveBankAccount = function () {
-            if(isNaN($scope.bankaccount.account_no)){
+            if (isNaN($scope.bankaccount.account_no)) {
                 alert("Account No应输入数字!");
                 return;
-            };
+            }
+            ;
             $http.put('/sys/partners/' + $scope.partner.client_moniker + '/bank_account', $scope.bankaccount).then(function () {
                 $scope.getBankAccount();
             }, function (resp) {
@@ -2200,7 +2266,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         };
         $scope.complianceChangeCheck();
     }]);
-    app.controller('surchargeAccountDetailCtrl', ['$scope','$http','balance','partner','transactions','commonDialog', function ($scope, $http, balance, partner, transactions,commonDialog) {
+    app.controller('surchargeAccountDetailCtrl', ['$scope', '$http', 'balance', 'partner', 'transactions', 'commonDialog', function ($scope, $http, balance, partner, transactions, commonDialog) {
         $scope.surcharge = angular.copy(balance);
         $scope.transactions = angular.copy(transactions.data);
         $scope.partner = angular.copy(partner);
@@ -2232,7 +2298,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             $scope.params = {};
         }
         $scope.save = function () {
-            $http.post('/sys/partners/' + $scope.partner.client_moniker + '/account/save', {amount:$scope.params.amount,remark:$scope.params.remark}).then(function (resp) {
+            $http.post('/sys/partners/' + $scope.partner.client_moniker + '/account/save', {
+                amount: $scope.params.amount,
+                remark: $scope.params.remark
+            }).then(function (resp) {
                 $scope.getTransactions();
                 $scope.getBalance();
                 $scope.canAddDetail = false;
@@ -2548,7 +2617,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     alert("Logo is necessary!");
                     return;
                 }
-                if($scope.partner.partner_type == 'photo'){
+                if ($scope.partner.partner_type == 'photo') {
                     if (!$scope.partner.company_photo) {
                         alert('Shop Photo1 is necessary');
                         return;
@@ -3340,7 +3409,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     detail: ['$http', '$stateParams', function ($http) {
                         return $http.get('/analysis/partner_card/' + client_id + '/settlement_logs/' + detail_id);
                     }],
-                    detail_id:detail_id
+                    detail_id: detail_id
                 },
                 size: 'lg'
             });
@@ -3408,7 +3477,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     detail: ['$http', '$stateParams', function ($http) {
                         return $http.get('/analysis/partner_card/' + client_id + '/settlement_logs/' + detail_id);
                     }],
-                    detail_id:detail_id
+                    detail_id: detail_id
                 },
                 size: 'lg'
             });
@@ -3416,17 +3485,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.chooseLast7Days();
     }]);
 
-    app.controller('managerSettlementDetailCtrl', ['$scope', 'detail','detail_id','$http', function ($scope, detail,detail_id,$http) {
+    app.controller('managerSettlementDetailCtrl', ['$scope', 'detail', 'detail_id', '$http', function ($scope, detail, detail_id, $http) {
         $scope.ctrl = {channel: null};
         $scope.show = true;
         $scope.report = detail.data;
-        $scope.report.total_charge = Decimal.add($scope.report.total_charge,$scope.report.tax_amount).toFixed(2);
-        angular.forEach($scope.report.channels,function (e) {
-            e.total_charge = Decimal.add(e.tax_amount,e.total_charge).toFixed(2);
+        $scope.report.total_charge = Decimal.add($scope.report.total_charge, $scope.report.tax_amount).toFixed(2);
+        angular.forEach($scope.report.channels, function (e) {
+            e.total_charge = Decimal.add(e.tax_amount, e.total_charge).toFixed(2);
         });
 
         $scope.channelAndDayOfAnalysis = function () {
-            $http.get('/analysis/partner_card/settlement_logs/' + detail_id+'/analysis/'+$scope.ctrl.channel).then(function (resp) {
+            $http.get('/analysis/partner_card/settlement_logs/' + detail_id + '/analysis/' + $scope.ctrl.channel).then(function (resp) {
                 $scope.channelAndDayMap = resp.data;
                 $scope.index = 0;
             })
@@ -3705,7 +3774,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         }
     }]);
 
-    app.controller('applyRpaySubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', 'businessStructuresMap','$filter', 'commonDialog','timezone', function ($scope, $http, $uibModal, $state, subMerchantInfo, businessStructuresMap,$filter, commonDialog,timezone) {
+    app.controller('applyRpaySubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', 'businessStructuresMap', '$filter', 'commonDialog', 'timezone', function ($scope, $http, $uibModal, $state, subMerchantInfo, businessStructuresMap, $filter, commonDialog, timezone) {
         $scope.subMerchantInfo = angular.copy(subMerchantInfo);
         $scope.business_structures = businessStructuresMap.configs();
         $scope.timezone = timezone.configs();
@@ -3713,7 +3782,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
 
         $scope.saveRpayAppliy = function (form) {
             var merchantInfo = {};
-                $scope.errmsg = null;
+            $scope.errmsg = null;
             if (form.$invalid) {
                 angular.forEach(form, function (item, key) {
                     if (key.indexOf('$') < 0) {
@@ -3722,13 +3791,13 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 });
                 return;
             }
-             angular.forEach(form, function (item, key) {
-                 if(item !=null) {
-                     if(item.$name !=null) {
-                         merchantInfo[key] = item.$modelValue;
-                     }
-                 }
-             });
+            angular.forEach(form, function (item, key) {
+                if (item != null) {
+                    if (item.$name != null) {
+                        merchantInfo[key] = item.$modelValue;
+                    }
+                }
+            });
 
             $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registRpaySubMerchantId', merchantInfo).then(function (resp) {
                 $scope.apply_sub_merchant_id = resp.data;
@@ -3751,17 +3820,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         }
     }]);
 
-    app.controller('applyYeepaySubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state','subMerchantInfo','yeepayIndustryMap','yeepayBusinessContentMap','$filter', 'commonDialog','Upload', function ($scope, $http, $uibModal, $state,subMerchantInfo,yeepayIndustryMap,yeepayBusinessContentMap,$filter, commonDialog,Upload) {
+    app.controller('applyYeepaySubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', 'yeepayIndustryMap', 'yeepayBusinessContentMap', '$filter', 'commonDialog', 'Upload', function ($scope, $http, $uibModal, $state, subMerchantInfo, yeepayIndustryMap, yeepayBusinessContentMap, $filter, commonDialog, Upload) {
         $scope.yeepay_industries = yeepayIndustryMap.configs();
         $scope.yeepay_business_contents = yeepayBusinessContentMap.configs();
         $scope.subMerchantInfo = angular.copy(subMerchantInfo);
-        if(!$scope.subMerchantInfo.abn){
+        if (!$scope.subMerchantInfo.abn) {
             $scope.subMerchantInfo.abn = $scope.subMerchantInfo.acn;
         }
-        var vouchers={};
+        var vouchers = {};
 
-        $scope.directors={};
-        $scope.executives={};
+        $scope.directors = {};
+        $scope.executives = {};
         $scope.industry = '';
         $scope.business_content = '';
         var merchantInfo = {};
@@ -4068,17 +4137,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         }
     }]);
 
-    app.controller('updateYeepaySubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state','subMerchantInfo','yeepayIndustryMap','yeepayBusinessContentMap','$filter', 'commonDialog','Upload','subMerchantId', function ($scope, $http, $uibModal, $state,subMerchantInfo,yeepayIndustryMap,yeepayBusinessContentMap,$filter, commonDialog,Upload,subMerchantId) {
+    app.controller('updateYeepaySubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', 'yeepayIndustryMap', 'yeepayBusinessContentMap', '$filter', 'commonDialog', 'Upload', 'subMerchantId', function ($scope, $http, $uibModal, $state, subMerchantInfo, yeepayIndustryMap, yeepayBusinessContentMap, $filter, commonDialog, Upload, subMerchantId) {
         $scope.yeepay_industries = yeepayIndustryMap.configs();
         $scope.yeepay_business_contents = yeepayBusinessContentMap.configs();
         $scope.subMerchantInfo = angular.copy(subMerchantInfo);
-        if(!$scope.subMerchantInfo.abn){
+        if (!$scope.subMerchantInfo.abn) {
             $scope.subMerchantInfo.abn = $scope.subMerchantInfo.acn;
         }
-        var vouchers={};
+        var vouchers = {};
 
-        $scope.directors={};
-        $scope.executives={};
+        $scope.directors = {};
+        $scope.executives = {};
         $scope.industry = '';
         $scope.business_content = '';
         var merchantInfo = {};
@@ -4388,10 +4457,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
 
 
     app.controller('permissionClientCtrl', ['$scope', '$http', '$uibModal', '$state', '$filter', 'commonDialog', function ($scope, $http, $uibModal, $state, $filter, commonDialog) {
-        $scope.clientPermission = {client_moniker:$scope.partner.client_moniker};
+        $scope.clientPermission = {client_moniker: $scope.partner.client_moniker};
         $scope.loadPermissionList = function () {
             var params = angular.copy($scope.clientPermission);
-            $http.get('/sys/permission/list',{params:params}).then(function (resp) {
+            $http.get('/sys/permission/list', {params: params}).then(function (resp) {
                 $scope.permissionList = resp.data;
             }, function (resp) {
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
@@ -4401,16 +4470,16 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         $scope.switchValid = function (permission) {
             $scope.clientPermission.isValid = permission.is_valid;
             var params = angular.copy($scope.clientPermission);
-            $http.post('/sys/permission/'+permission.id,params).then(function (resp) {
-            },function (resp) {
+            $http.post('/sys/permission/' + permission.id, params).then(function (resp) {
+            }, function (resp) {
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
             })
         };
 
         $scope.init = function () {
-            var params = {client_moniker:$scope.partner.client_moniker};
-            $http.post('/sys/permission/init',params).then(function (resp) {
-            },function (resp) {
+            var params = {client_moniker: $scope.partner.client_moniker};
+            $http.post('/sys/permission/init', params).then(function (resp) {
+            }, function (resp) {
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
             })
         };
@@ -4418,11 +4487,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
     }]);
 
 
-
-
-
-
-
     app.filter('bdOrg', function () {
         return function (bdUsers, org_id) {
             if (org_id) {
diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html
index aff61f82b..0ed591d6e 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -1,5 +1,5 @@
 <style>
-    .img-size{
+    .img-size {
         max-height: 100px;
         margin-left: 20px;
     }
@@ -248,28 +248,30 @@
                             </div>
                             <div class="form-group" ng-if="partner.partner_type == 'photo'">
                                 <label class="control-label col-sm-2">* Shop Photo</label>
-                                    <div class="col-sm-4">
-                                        <div class="form-control-static"><em>1:</em>&nbsp;
-                                            <button class="btn btn-primary" type="button"
-                                                    ngf-select="uploadShopPhoto($file)" accept="image/*">
-                                                <i class="fa fa-upload"></i> Upload Shop Photo1
-                                            </button>
-                                        </div>
-                                        <uib-progressbar value="shopPhotoProgress.value"
-                                                         ng-if="shopPhotoProgress"></uib-progressbar>
-                                        <img ng-src="{{partner.company_photo}}" ng-if="partner.company_photo" class="thumbnail img-size col-sm-9">
+                                <div class="col-sm-4">
+                                    <div class="form-control-static"><em>1:</em>&nbsp;
+                                        <button class="btn btn-primary" type="button"
+                                                ngf-select="uploadShopPhoto($file)" accept="image/*">
+                                            <i class="fa fa-upload"></i> Upload Shop Photo1
+                                        </button>
                                     </div>
-                                    <div class="col-sm-4">
-                                        <div class="form-control-static"><em>2:</em>&nbsp;
-                                            <button class="btn btn-primary" type="button"
-                                                    ngf-select="uploadStorePhoto($file)" accept="image/*">
-                                                <i class="fa fa-upload"></i> Upload Shop Photo2
-                                            </button>
-                                        </div>
-                                        <uib-progressbar value="storePhotoProgress.value"
-                                                         ng-if="storePhotoProgress"></uib-progressbar>
-                                        <img ng-src="{{partner.store_photo}}" ng-if="partner.store_photo" class="thumbnail img-size col-sm-9">
+                                    <uib-progressbar value="shopPhotoProgress.value"
+                                                     ng-if="shopPhotoProgress"></uib-progressbar>
+                                    <img ng-src="{{partner.company_photo}}" ng-if="partner.company_photo"
+                                         class="thumbnail img-size col-sm-9">
+                                </div>
+                                <div class="col-sm-4">
+                                    <div class="form-control-static"><em>2:</em>&nbsp;
+                                        <button class="btn btn-primary" type="button"
+                                                ngf-select="uploadStorePhoto($file)" accept="image/*">
+                                            <i class="fa fa-upload"></i> Upload Shop Photo2
+                                        </button>
                                     </div>
+                                    <uib-progressbar value="storePhotoProgress.value"
+                                                     ng-if="storePhotoProgress"></uib-progressbar>
+                                    <img ng-src="{{partner.store_photo}}" ng-if="partner.store_photo"
+                                         class="thumbnail img-size col-sm-9">
+                                </div>
                             </div>
 
                             <div class="form-group" ng-if="partner.partner_type == 'companyWebsite'"
@@ -389,489 +391,599 @@
                     </div>
                 </div>
                 <!--end 商户基本资料-->
+                <!--商户支付场景-->
                 <div class="panel panel-default">
-                    <div class="panel-heading">Alipay Information &nbsp;<em class="small"><b>(Optional)</b></em></div>
+                    <div class="panel-heading">Merchant Payment Scenario</div>
                     <div class="panel-body">
                         <div class="form-horizontal">
-                            <div class="form-group">
-                                <label class="control-label col-sm-2">
-                                    Business Hours</label>
-                                <div class="col-sm-8">
-                                    <input type="text" class="form-control" ng-model="partner.business_hours">
-                                    <p class="small text-info">
-                                        eg:Monday-Friday 09:00-20:00,Saturday-Sunday 10:00-22:00</p>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="control-label col-sm-2">
-                                    Merchant Tag<em class="small">(Chinese)</em></label>
-                                <div class="col-sm-8">
-                                    <input type="text" class="form-control" ng-model="partner.merchant_tag">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="control-label col-sm-2">
-                                    Merchant Introduction<em class="small">(Chinese)</em></label>
-                                <div class="col-sm-8">
-                                    <textarea  class="form-control" ng-model="partner.merchant_introduction"></textarea>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="control-label col-sm-2">
-                                    Video  Introduction<br><em class="small">(youtube link)</em></label>
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.client_pay_type.$invalid && partnerForm.client_pay_type.$dirty}">
+                                <label class="control-label col-sm-2" for="client-pay-type-select">*
+                                    Merchant Payment Scenario Type</label>
                                 <div class="col-sm-8">
-                                    <input type="text" class="form-control" ng-model="partner.merchant_video_url">
-                                    <p class="small text-info">eg:https://www.baidu.com</p>
+                                    <select class="form-control" ng-model="partner.client_pay_type"
+                                            id="client-pay-type-select"
+                                            name="client_pay_type">
+                                        <option value="">Please Choose</option>
+                                        <option value="all">All</option>
+                                        <option value="online">线上</option>
+                                        <option value="offline">线下</option>
+                                    </select>
+                                    <div ng-messages="partnerForm.client_pay_type.$error"
+                                         ng-if="partnerForm.client_pay_type.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    </div>
-                </div>
-                <!--支付宝资料-->
-                <div class="panel panel-default">
-                    <div class="panel-heading">Contact Information</div>
-                    <div class="panel-body">
-                        <div class="form-horizontal">
+                            <!--<div ng-if="partner.client_pay_type=='online' || partner.client_pay_type=='all'">-->
+                            <!--<div class="form-group">-->
+                            <!--<label class="control-label col-sm-2">-->
+                            <!--Website</label>-->
+                            <!--<div class="col-sm-8">-->
+                            <!--<input type="text" class="form-control"-->
+                            <!--ng-model="partner.online_website">-->
+                            <!--</div>-->
+                            <!--</div>-->
+                            <!--<div class="form-group">-->
+                            <!--<label class="control-label col-sm-2">-->
+                            <!--公众号名称</label>-->
+                            <!--<div class="col-sm-8">-->
+                            <!--<input type="text" class="form-control"-->
+                            <!--ng-model="partner.online_public_account">-->
+                            <!--</div>-->
+                            <!--</div>-->
+                            <!--<div class="form-group">-->
+                            <!--<label class="control-label col-sm-2">-->
+                            <!--Mini Program Name</label>-->
+                            <!--<div class="col-sm-8">-->
+                            <!--<input type="text" class="form-control"-->
+                            <!--ng-model="partner.online_mini_program">-->
+                            <!--</div>-->
+                            <!--</div>-->
+                            <!--<div class="form-group">-->
+                            <!--<label class="control-label col-sm-2">-->
+                            <!--APP Name</label>-->
+                            <!--<div class="col-sm-8">-->
+                            <!--<input type="text" class="form-control"-->
+                            <!--ng-model="partner.online_app">-->
+                            <!--<p class="small text-info">-->
+                            <!--<i class="fa fa-info"></i> 线上支付场景至少选择填一项</p>-->
+                            <!--</div>-->
+
+                            <!--</div>-->
+                            <!--</div>-->
+                            <!--<div ng-if="partner.client_pay_type=='offline' || partner.client_pay_type=='all'">-->
+                            <!--<div class="form-group"-->
+                            <!--ng-class="{'has-error':partnerForm.client_offline.$invalid && partnerForm.client_offline.$dirty}">-->
+                            <!--<label class="control-label col-sm-2"-->
+                            <!--for="client-offline-desc">*Offline Scene Of Merchants</label>-->
+                            <!--<div class="col-sm-8">-->
+                            <!--<input class="form-control" id="client-offline-desc" required-->
+                            <!--name="client_offline" readonly-->
+                            <!--ng-model="partner.client_offline_desc | partner_offline_desc"-->
+                            <!--multi-level-select-popup="client_offline_select"-->
+                            <!--on-select="onOfflineDescSelect($selected)">-->
+                            <!--<div ng-messages="partnerForm.client_offline.$error"-->
+                            <!--ng-if="partnerForm.client_offline.$dirty">-->
+                            <!--<p class="small text-danger" ng-message="required">Required-->
+                            <!--Field</p>-->
+                            <!--</div>-->
+                            <!--</div>-->
+                            <!--</div>-->
+                            <!--</div>-->
                             <div class="form-group"
-                                 ng-class="{'has-error':partnerForm.contact_person.$invalid && partnerForm.contact_person.$dirty}">
-                                <label class="control-label col-sm-2" for="contact_person-input">*
-                                    Contact Person
-                                    Name</label>
+                                 ng-class="{'has-error':partnerForm.client_pay_desc.$invalid && partnerForm.client_pay_desc.$dirty}">
+                                <label class="control-label col-sm-2" for="client-pay-desc-input">*
+                                    Merchant Payment Scenario Description</label>
                                 <div class="col-sm-8">
-                                    <input class="form-control" ng-model="partner.contact_person"
-                                           required
-                                           name="contact_person"
-                                           id="contact_person-input" maxlength="50">
-                                    <div ng-messages="partnerForm.contact_person.$error"
-                                         ng-if="partnerForm.contact_person.$dirty">
+                                <textarea class="form-control" required
+                                          ng-model="partner.client_pay_desc"
+                                          name="client_pay_desc" id="client-pay-desc-input"
+                                          maxlength="200"></textarea>
+                                    <p class="small text-info">
+                                        <i class="fa fa-info"></i> 例如：线下场景：门店（立牌、POS）、收银系统（选择品牌名称【ipos、银豹、aupos、其他】）、无门店</p>
+                                    <div ng-messages="partnerForm.client_pay_desc.$error"
+                                         ng-if="partnerForm.client_pay_desc.$dirty">
                                         <p class="small text-danger" ng-message="required">Required
                                             Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Less
-                                            Than 50
+                                            Than 200
                                             Characters(including symbols and spaces)</p>
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group"
-                                 ng-class="{'has-error':partnerForm.contact_phone_p.$invalid && partnerForm.contact_phone_p.$dirty}">
-                                <label class="control-label col-sm-2" for="contact-phone-p-input">*
-                                    Phone</label>
-                                <!-- <div class="col-sm-8">
-                                     <input type="text" class="form-control" ng-model="partner.contact_phone" required
-                                            name="contact_phone" id="contact-phone-input" maxlength="20">
-                                 </div>
-                                 <div ng-messages="partnerForm.contact_phone.$error"
-                                      ng-if="partnerForm.contact_phone.$dirty">
-                                     <p class="small text-danger" ng-message="required">Required Field</p>
-                                     <p class="small text-danger" ng-message="maxlength">Less Than 20
-                                         Characters(including symbols and spaces)</p>
-                                 </div>-->
+                        </div>
+                    </div>
 
-                                <div class="col-sm-2">
-                                    <div class="input-group">
-                                        <div class="input-group-addon">+</div>
-                                        <input class="form-control" required type="text"
-                                               ng-model="partner.contact_phone_c"
-                                               name="contact_phone_c" id="contact-phone-c-input"
-                                               maxlength="3" minlength="1"
-                                               placeholder="country code">
+                    <div class="panel panel-default">
+                        <div class="panel-heading">Alipay Information &nbsp;<em class="small"><b>(Optional)</b></em>
+                        </div>
+                        <div class="panel-body">
+                            <div class="form-horizontal">
+                                <div class="form-group">
+                                    <label class="control-label col-sm-2">
+                                        Business Hours</label>
+                                    <div class="col-sm-8">
+                                        <input type="text" class="form-control" ng-model="partner.business_hours">
+                                        <p class="small text-info">
+                                            eg:Monday-Friday 09:00-20:00,Saturday-Sunday 10:00-22:00</p>
                                     </div>
-
-                                    <div ng-messages="partnerForm.contact_phone_c.$error"
-                                         ng-if="partnerForm.contact_phone_c.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required
-                                            Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Less
-                                            Than 20 Characters</p>
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-2">
+                                        Merchant Tag<em class="small">(Chinese)</em></label>
+                                    <div class="col-sm-8">
+                                        <input type="text" class="form-control" ng-model="partner.merchant_tag">
                                     </div>
                                 </div>
-                                <div class="col-sm-2">
-                                    <input class="form-control" type="text"
-                                           ng-model="partner.contact_phone_a"
-                                           title="eg:3,当为手机号、服务电话时，可以不填"
-                                           name="contact_phone_a" id="contact-phone-a-input"
-                                           maxlength="2" placeholder="area code">
-                                    <div ng-messages="partnerForm.contact_phone_a.$error"
-                                         ng-if="partnerForm.contact_phone_a.$dirty">
-                                        <p class="small text-danger" ng-message="maxlength">Less
-                                            Than 2 Characters</p>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-2">
+                                        Merchant Introduction<em class="small">(Chinese)</em></label>
+                                    <div class="col-sm-8">
+                                        <textarea class="form-control"
+                                                  ng-model="partner.merchant_introduction"></textarea>
                                     </div>
                                 </div>
-                                <div class="col-sm-4">
-                                    <input class="form-control" required type="text"
-                                           ng-model="partner.contact_phone_p"
-                                           name="contact_phone_p" id="contact-phone-p-input"
-                                           maxlength="11" placeholder="phone number">
-                                    <div ng-messages="partnerForm.contact_phone_p.$error"
-                                         ng-if="partnerForm.contact_phone_p.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required
-                                            Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Less
-                                            Than 11 Characters</p>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-2">
+                                        Video Introduction<br><em class="small">(youtube link)</em></label>
+                                    <div class="col-sm-8">
+                                        <input type="text" class="form-control" ng-model="partner.merchant_video_url">
+                                        <p class="small text-info">eg:https://www.baidu.com</p>
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group"
-                                 ng-class="{'has-error':partnerForm.contact_email.$invalid && partnerForm.contact_email.$dirty}">
-                                <label class="control-label col-sm-2" for="contact-email-id">*
-                                    E-mail</label>
-                                <div class="col-sm-8">
-                                    <input class="form-control" ng-model="partner.contact_email"
-                                           required
-                                           name="contact_email" id="contact-email-id"
-                                           maxlength="50">
+                        </div>
+                    </div>
+                    <!--支付宝资料-->
+                    <div class="panel panel-default">
+                        <div class="panel-heading">Contact Information</div>
+                        <div class="panel-body">
+                            <div class="form-horizontal">
+                                <div class="form-group"
+                                     ng-class="{'has-error':partnerForm.contact_person.$invalid && partnerForm.contact_person.$dirty}">
+                                    <label class="control-label col-sm-2" for="contact_person-input">*
+                                        Contact Person
+                                        Name</label>
+                                    <div class="col-sm-8">
+                                        <input class="form-control" ng-model="partner.contact_person"
+                                               required
+                                               name="contact_person"
+                                               id="contact_person-input" maxlength="50">
+                                        <div ng-messages="partnerForm.contact_person.$error"
+                                             ng-if="partnerForm.contact_person.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 50
+                                                Characters(including symbols and spaces)</p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group"
+                                     ng-class="{'has-error':partnerForm.contact_phone_p.$invalid && partnerForm.contact_phone_p.$dirty}">
+                                    <label class="control-label col-sm-2" for="contact-phone-p-input">*
+                                        Phone</label>
+                                    <!-- <div class="col-sm-8">
+                                         <input type="text" class="form-control" ng-model="partner.contact_phone" required
+                                                name="contact_phone" id="contact-phone-input" maxlength="20">
+                                     </div>
+                                     <div ng-messages="partnerForm.contact_phone.$error"
+                                          ng-if="partnerForm.contact_phone.$dirty">
+                                         <p class="small text-danger" ng-message="required">Required Field</p>
+                                         <p class="small text-danger" ng-message="maxlength">Less Than 20
+                                             Characters(including symbols and spaces)</p>
+                                     </div>-->
+
+                                    <div class="col-sm-2">
+                                        <div class="input-group">
+                                            <div class="input-group-addon">+</div>
+                                            <input class="form-control" required type="text"
+                                                   ng-model="partner.contact_phone_c"
+                                                   name="contact_phone_c" id="contact-phone-c-input"
+                                                   maxlength="3" minlength="1"
+                                                   placeholder="country code">
+                                        </div>
+
+                                        <div ng-messages="partnerForm.contact_phone_c.$error"
+                                             ng-if="partnerForm.contact_phone_c.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 20 Characters</p>
+                                        </div>
+                                    </div>
+                                    <div class="col-sm-2">
+                                        <input class="form-control" type="text"
+                                               ng-model="partner.contact_phone_a"
+                                               title="eg:3,当为手机号、服务电话时，可以不填"
+                                               name="contact_phone_a" id="contact-phone-a-input"
+                                               maxlength="2" placeholder="area code">
+                                        <div ng-messages="partnerForm.contact_phone_a.$error"
+                                             ng-if="partnerForm.contact_phone_a.$dirty">
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 2 Characters</p>
+                                        </div>
+                                    </div>
+                                    <div class="col-sm-4">
+                                        <input class="form-control" required type="text"
+                                               ng-model="partner.contact_phone_p"
+                                               name="contact_phone_p" id="contact-phone-p-input"
+                                               maxlength="11" placeholder="phone number">
+                                        <div ng-messages="partnerForm.contact_phone_p.$error"
+                                             ng-if="partnerForm.contact_phone_p.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 11 Characters</p>
+                                        </div>
+                                    </div>
                                 </div>
-                                <div ng-messages="partnerForm.contact_email.$error"
-                                     ng-if="partnerForm.contact_email.$dirty">
-                                    <p class="small text-danger" ng-message="required">Required
-                                        Field</p>
-                                    <p class="small text-danger" ng-message="maxlength">Less Than 50
-                                        Characters(including symbols and spaces)</p>
+                                <div class="form-group"
+                                     ng-class="{'has-error':partnerForm.contact_email.$invalid && partnerForm.contact_email.$dirty}">
+                                    <label class="control-label col-sm-2" for="contact-email-id">*
+                                        E-mail</label>
+                                    <div class="col-sm-8">
+                                        <input class="form-control" ng-model="partner.contact_email"
+                                               required
+                                               name="contact_email" id="contact-email-id"
+                                               maxlength="50">
+                                    </div>
+                                    <div ng-messages="partnerForm.contact_email.$error"
+                                         ng-if="partnerForm.contact_email.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Less Than 50
+                                            Characters(including symbols and spaces)</p>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>
-                <!--end 商户联系资料-->
-                <div class="panel panel-default">
-                    <div class="panel-heading">Address Information</div>
-                    <div class="panel-body">
-                        <div class="form-horizontal">
-                            <div class="form-group col-sm-6"
-                                 ng-class="{'has-error':partnerForm.address.$invalid && partnerForm.address.$dirty}">
-                                <label class="control-label col-sm-4" for="address-input">*
-                                    Address</label>
-                                <div class="col-sm-8">
+                    <!--end 商户联系资料-->
+                    <div class="panel panel-default">
+                        <div class="panel-heading">Address Information</div>
+                        <div class="panel-body">
+                            <div class="form-horizontal">
+                                <div class="form-group col-sm-6"
+                                     ng-class="{'has-error':partnerForm.address.$invalid && partnerForm.address.$dirty}">
+                                    <label class="control-label col-sm-4" for="address-input">*
+                                        Address</label>
+                                    <div class="col-sm-8">
                                 <textarea class="form-control" ng-model="partner.address"
                                           name="address"
                                           id="address-input" maxlength="200" required></textarea>
-                                    <div ng-messages="partnerForm.address.$error"
-                                         ng-if="partnerForm.address.$dirty">
-                                        <p class="small text-danger" ng-message="maxlength">Less
-                                            Than 200
-                                            Characters(including symbols and spaces)</p>
-                                        <p class="small text-danger" ng-message="required">Required
-                                            Field</p>
+                                        <div ng-messages="partnerForm.address.$error"
+                                             ng-if="partnerForm.address.$dirty">
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 200
+                                                Characters(including symbols and spaces)</p>
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="form-group col-sm-6"
-                                 ng-class="{'has-error':partnerForm.suburb.$invalid && partnerForm.suburb.$dirty}">
-                                <label class="control-label col-sm-4" for="suburb-input">*
-                                    Suburb</label>
-                                <div class="col-sm-8">
-                                    <input class="form-control" ng-model="partner.suburb"
-                                           name="suburb"
-                                           id="suburb-input" maxlength="50" required>
-                                    <div ng-messages="partnerForm.suburb.$error"
-                                         ng-if="partnerForm.suburb.$dirty">
-                                        <p class="small text-danger" ng-message="maxlength">Less
-                                            Than 50
-                                            Characters(including symbols and spaces)</p>
-                                        <p class="small text-danger" ng-message="required">Required
-                                            Field</p>
+                                <div class="form-group col-sm-6"
+                                     ng-class="{'has-error':partnerForm.suburb.$invalid && partnerForm.suburb.$dirty}">
+                                    <label class="control-label col-sm-4" for="suburb-input">*
+                                        Suburb</label>
+                                    <div class="col-sm-8">
+                                        <input class="form-control" ng-model="partner.suburb"
+                                               name="suburb"
+                                               id="suburb-input" maxlength="50" required>
+                                        <div ng-messages="partnerForm.suburb.$error"
+                                             ng-if="partnerForm.suburb.$dirty">
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 50
+                                                Characters(including symbols and spaces)</p>
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+                                        <!--</div>-->
+                                        <!--<select class="form-control" name="suburb" required ng-model="partner.suburb"-->
+                                        <!--id="suburb-input"-->
+                                        <!--ng-options="t2c.key as t2c.value for t2c in t2city_map">-->
+                                        <!--<option value="">Please Choose</option>-->
+                                        <!--</select>-->
+                                        <!--<div ng-messages="partnerForm.suburb.$error" ng-if="partnerForm.suburb.$dirty">-->
+                                        <!--<p class="small text-danger" ng-message="required">Required Field</p>-->
+                                        <!--</div>-->
                                     </div>
-                                    <!--</div>-->
-                                    <!--<select class="form-control" name="suburb" required ng-model="partner.suburb"-->
-                                    <!--id="suburb-input"-->
-                                    <!--ng-options="t2c.key as t2c.value for t2c in t2city_map">-->
-                                    <!--<option value="">Please Choose</option>-->
-                                    <!--</select>-->
-                                    <!--<div ng-messages="partnerForm.suburb.$error" ng-if="partnerForm.suburb.$dirty">-->
-                                    <!--<p class="small text-danger" ng-message="required">Required Field</p>-->
-                                    <!--</div>-->
                                 </div>
-                            </div>
-                            <div class="form-group col-sm-6"
-                                 ng-class="{'has-error':partnerForm.postcode.$invalid && partnerForm.postcode.$dirty}">
-                                <label class="control-label col-sm-4" for="postcode-input">*
-                                    PostCode</label>
-                                <div class="col-sm-8">
-                                    <input class="form-control" ng-model="partner.postcode"
-                                           name="postcode"
-                                           id="postcode-input" maxlength="10" required>
-                                    <div ng-messages="partnerForm.postcode.$error"
-                                         ng-if="partnerForm.postcode.$dirty">
-                                        <p class="small text-danger" ng-message="maxlength">Less
-                                            Than 10
-                                            Characters(including symbols and spaces)</p>
-                                        <p class="small text-danger" ng-message="required">Required
-                                            Field</p>
+                                <div class="form-group col-sm-6"
+                                     ng-class="{'has-error':partnerForm.postcode.$invalid && partnerForm.postcode.$dirty}">
+                                    <label class="control-label col-sm-4" for="postcode-input">*
+                                        PostCode</label>
+                                    <div class="col-sm-8">
+                                        <input class="form-control" ng-model="partner.postcode"
+                                               name="postcode"
+                                               id="postcode-input" maxlength="10" required>
+                                        <div ng-messages="partnerForm.postcode.$error"
+                                             ng-if="partnerForm.postcode.$dirty">
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 10
+                                                Characters(including symbols and spaces)</p>
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="form-group col-sm-6"
-                                 ng-class="{'has-error':partnerForm.state.$invalid && partnerForm.state.$dirty}">
-                                <label class="control-label col-sm-4" for="state-input">*
-                                    State</label>
-                                <div class="col-sm-8">
-                                    <!--<input class="form-control" ng-model="partner.state" name="state" id="state-input"-->
-                                    <!--maxlength="20">-->
-                                    <!--<div ng-messages="partnerForm.state.$error" ng-if="partnerForm.state.$dirty">-->
-                                    <!--<p class="small text-danger" ng-message="maxlength">Less Than 20-->
-                                    <!--Characters(including symbols and spaces)</p>-->
-                                    <!--</div>-->
-                                    <select class="form-control" name="state" required
-                                            ng-model="partner.state"
-                                            id="state-input"
-                                            ng-options="state.value as state.label for state in states">
-                                        <option value="">Please Choose</option>
-                                    </select>
-                                    <div ng-messages="partnerForm.state.$error"
-                                         ng-if="partnerForm.state.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required
-                                            Field</p>
-                                    </div>
+                                <div class="form-group col-sm-6"
+                                     ng-class="{'has-error':partnerForm.state.$invalid && partnerForm.state.$dirty}">
+                                    <label class="control-label col-sm-4" for="state-input">*
+                                        State</label>
+                                    <div class="col-sm-8">
+                                        <!--<input class="form-control" ng-model="partner.state" name="state" id="state-input"-->
+                                        <!--maxlength="20">-->
+                                        <!--<div ng-messages="partnerForm.state.$error" ng-if="partnerForm.state.$dirty">-->
+                                        <!--<p class="small text-danger" ng-message="maxlength">Less Than 20-->
+                                        <!--Characters(including symbols and spaces)</p>-->
+                                        <!--</div>-->
+                                        <select class="form-control" name="state" required
+                                                ng-model="partner.state"
+                                                id="state-input"
+                                                ng-options="state.value as state.label for state in states">
+                                            <option value="">Please Choose</option>
+                                        </select>
+                                        <div ng-messages="partnerForm.state.$error"
+                                             ng-if="partnerForm.state.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
 
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="form-group col-sm-6"
-                                 ng-class="{'has-error':partnerForm.country.$invalid && partnerForm.country.$dirty}">
-                                <label class="control-label col-sm-4" for="country-input">*
-                                    Country</label>
-                                <div class="col-sm-8">
-                                    <input class="form-control"
-                                           ng-init="partner.country=partner.country||'AUS'"
-                                           ng-model="partner.country" name="country"
-                                           id="country-input" maxlength="20" required
-                                           placeholder="AUS" readonly="readonly">
-                                    <div ng-messages="partnerForm.country.$error"
-                                         ng-if="partnerForm.country.$dirty">
-                                        <p class="small text-danger" ng-message="maxlength">Less
-                                            Than 20
-                                            Characters(including symbols and spaces)</p>
-                                        <p class="small text-danger" ng-message="required">Required
-                                            Field</p>
+                                <div class="form-group col-sm-6"
+                                     ng-class="{'has-error':partnerForm.country.$invalid && partnerForm.country.$dirty}">
+                                    <label class="control-label col-sm-4" for="country-input">*
+                                        Country</label>
+                                    <div class="col-sm-8">
+                                        <input class="form-control"
+                                               ng-init="partner.country=partner.country||'AUS'"
+                                               ng-model="partner.country" name="country"
+                                               id="country-input" maxlength="20" required
+                                               placeholder="AUS" readonly="readonly">
+                                        <div ng-messages="partnerForm.country.$error"
+                                             ng-if="partnerForm.country.$dirty">
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 20
+                                                Characters(including symbols and spaces)</p>
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+                                        <!--选择框-->
+                                        <!--<select class="form-control" name="country" required ng-model="partner.country"-->
+                                        <!--id="country-input"-->
+                                        <!--ng-options="country.value as country.label for country in countries">-->
+                                        <!--<option value="">Please Choose</option>-->
+                                        <!--</select>-->
+                                        <!--<div ng-messages="partnerForm.country.$error" ng-if="partnerForm.country.$dirty">-->
+                                        <!--<p class="small text-danger" ng-message="required">Required Field</p>-->
+                                        <!--</div>-->
                                     </div>
-                                    <!--选择框-->
-                                    <!--<select class="form-control" name="country" required ng-model="partner.country"-->
-                                    <!--id="country-input"-->
-                                    <!--ng-options="country.value as country.label for country in countries">-->
-                                    <!--<option value="">Please Choose</option>-->
-                                    <!--</select>-->
-                                    <!--<div ng-messages="partnerForm.country.$error" ng-if="partnerForm.country.$dirty">-->
-                                    <!--<p class="small text-danger" ng-message="required">Required Field</p>-->
-                                    <!--</div>-->
                                 </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="control-label col-sm-2"
-                                       for="tz-select">TimeZone</label>
-                                <div class="col-sm-9">
-                                    <select class="form-control" name="timezone"
-                                            ng-model="partner.timezone"
-                                            id="tz-select"
-                                            ng-options="tz.key as tz.detail for tz in timezones">
-                                    </select>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-2"
+                                           for="tz-select">TimeZone</label>
+                                    <div class="col-sm-9">
+                                        <select class="form-control" name="timezone"
+                                                ng-model="partner.timezone"
+                                                id="tz-select"
+                                                ng-options="tz.key as tz.detail for tz in timezones">
+                                        </select>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="panel panel-default">
-                    <div class="panel-heading" style="font-size: larger">Location
-                        <span id="editmap" hidden>true</span>
-                        <span id="add_view" hidden>true</span>
-                    </div>
-                    <div class="form-group">
-                        <div class="embed-responsive" style="height: 300px;">
-                            <iframe id="merchant_detail" name="merchant_detail" class="embed-responsive-item" src="one_locations.html"></iframe>
+                    <div class="panel panel-default">
+                        <div class="panel-heading" style="font-size: larger">Location
+                            <span id="editmap" hidden>true</span>
+                            <span id="add_view" hidden>true</span>
+                        </div>
+                        <div class="form-group">
+                            <div class="embed-responsive" style="height: 300px;">
+                                <iframe id="merchant_detail" name="merchant_detail" class="embed-responsive-item"
+                                        src="one_locations.html"></iframe>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <!--<div class="panel panel-info">
-                    <div class="panel-heading">Alipay Parameters</div>
-                    <div class="panel-body form-horizontal">
-                        <div class="form-group col-sm-6"
-                             ng-class="{'has-error':partnerForm.alipay_category.$invalid && partnerForm.alipay_category.$dirty}">
-                            <label class="control-label col-sm-4"
-                                   for="alipay_category">*Category</label>
-                            <div class="col-sm-8" >
-                                <input class="form-control" id="alipay_category" required
-                                       name="alipay_category" readonly
-                                       ng-model="partner.alipay_category"
-                                       multi-level-select-popup="alipayMccCategory"
-                                       on-select="onAlipayMccSelect($selected)">
-                                <div ng-messages="partnerForm.alipay_category.$error"
-                                     ng-if="partnerForm.alipay_category.$dirty">
-                                    <p class="small text-danger" ng-message="required">Required
-                                        Field</p>
+                    <!--<div class="panel panel-info">
+                        <div class="panel-heading">Alipay Parameters</div>
+                        <div class="panel-body form-horizontal">
+                            <div class="form-group col-sm-6"
+                                 ng-class="{'has-error':partnerForm.alipay_category.$invalid && partnerForm.alipay_category.$dirty}">
+                                <label class="control-label col-sm-4"
+                                       for="alipay_category">*Category</label>
+                                <div class="col-sm-8" >
+                                    <input class="form-control" id="alipay_category" required
+                                           name="alipay_category" readonly
+                                           ng-model="partner.alipay_category"
+                                           multi-level-select-popup="alipayMccCategory"
+                                           on-select="onAlipayMccSelect($selected)">
+                                    <div ng-messages="partnerForm.alipay_category.$error"
+                                         ng-if="partnerForm.alipay_category.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>
 
 
-                <div class="panel panel-info">
-                    <div class="panel-heading" style="background:#62b900">wechat Parameters</div>
-                    <div class="panel-body form-horizontal">
-                        <div class="form-group"
-                             ng-class="{'has-error':partnerForm.industry.$invalid && partnerForm.industry.$dirty}">
-                            <label class="control-label col-sm-2" for="industry-input">
-                                *Industry</label>
-                            <div class="col-sm-8">
-                                <select class="form-control" name="industry"
-                                        ng-model="partner.industry"
-                                        id="industry-input" required
-                                        ng-options="industry.value as industry.label for industry in industries">
-                                    <option value="">Please Choose</option>
-                                </select>
-                                <div ng-messages="partnerForm.industry.$error"
-                                     ng-if="partnerForm.industry.$dirty">
-                                    <p class="small text-danger" ng-message="required">Required
-                                        Field</p>
+                    <div class="panel panel-info">
+                        <div class="panel-heading" style="background:#62b900">wechat Parameters</div>
+                        <div class="panel-body form-horizontal">
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.industry.$invalid && partnerForm.industry.$dirty}">
+                                <label class="control-label col-sm-2" for="industry-input">
+                                    *Industry</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="industry"
+                                            ng-model="partner.industry"
+                                            id="industry-input" required
+                                            ng-options="industry.value as industry.label for industry in industries">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="partnerForm.industry.$error"
+                                         ng-if="partnerForm.industry.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>
 
 
-                <div class="panel panel-info">
-                    <div class="panel-heading" style="background:#d82d2d">JD Parameters</div>
-                    <div class="panel-body form-horizontal">
-                        <div class="form-group"
-                             ng-class="{'has-error':partnerForm.jdindustry.$invalid && partnerForm.jdindustry.$dirty}">
-                            <label class="control-label col-sm-2" for="jdindustry-input">
-                                *Industry</label>
-                            <div class="col-sm-8">
-                                <select class="form-control" name="jdindustry"
-                                        ng-model="partner.jdindustry"
-                                        id="jdindustry-input" required
-                                        ng-options="industry.value as industry.label for industry in jdindustry">
-                                    <option value="">Please Choose</option>
-                                </select>
-                                <div ng-messages="partnerForm.jdindustry.$error"
-                                     ng-if="partnerForm.jdindustry.$dirty">
-                                    <p class="small text-danger" ng-message="required">Required
-                                        Field</p>
+                    <div class="panel panel-info">
+                        <div class="panel-heading" style="background:#d82d2d">JD Parameters</div>
+                        <div class="panel-body form-horizontal">
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.jdindustry.$invalid && partnerForm.jdindustry.$dirty}">
+                                <label class="control-label col-sm-2" for="jdindustry-input">
+                                    *Industry</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="jdindustry"
+                                            ng-model="partner.jdindustry"
+                                            id="jdindustry-input" required
+                                            ng-options="industry.value as industry.label for industry in jdindustry">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="partnerForm.jdindustry.$error"
+                                         ng-if="partnerForm.jdindustry.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>
 
-                <div class="panel panel-info">
-                    <div class="panel-heading" style="background:#f06010;color: #f6f6f6;">RoyalPay Parameters</div>
-                    <div class="panel-body form-horizontal">
-                        <div class="form-group"
-                             ng-class="{'has-error':partnerForm.royalpayindustry.$invalid && partnerForm.royalpayindustry.$dirty}">
-                            <label class="control-label col-sm-2" for="royalpayindustry-input">
-                                *Industry</label>
-                            <div class="col-sm-8">
-                                <select class="form-control" name="royalpayindustry"
-                                        ng-model="partner.royalpayindustry"
-                                        id="royalpayindustry-input" required
-                                        ng-options="industry.value as industry.label for industry in royalpayindustry">
-                                    <option value="">Please Choose</option>
-                                </select>
-                                <div ng-messages="partnerForm.royalpayindustry.$error"
-                                     ng-if="partnerForm.royalpayindustry.$dirty">
-                                    <p class="small text-danger" ng-message="required">Required
-                                        Field</p>
+                    <div class="panel panel-info">
+                        <div class="panel-heading" style="background:#f06010;color: #f6f6f6;">RoyalPay Parameters</div>
+                        <div class="panel-body form-horizontal">
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.royalpayindustry.$invalid && partnerForm.royalpayindustry.$dirty}">
+                                <label class="control-label col-sm-2" for="royalpayindustry-input">
+                                    *Industry</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="royalpayindustry"
+                                            ng-model="partner.royalpayindustry"
+                                            id="royalpayindustry-input" required
+                                            ng-options="industry.value as industry.label for industry in royalpayindustry">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="partnerForm.royalpayindustry.$error"
+                                         ng-if="partnerForm.royalpayindustry.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                </div>-->
+                    </div>-->
 
 
-                <div class="panel panel-default">
-                    <div class="panel-heading" style="color: #333;background-color: #f5f5f5;border-color: #ddd;">Industry</div>
-                    <div class="panel-body form-horizontal">
-                        <div class="form-group"
-                             ng-class="{'has-error':partnerForm.royalpay_label.$invalid && partnerForm.royalpay_label.$dirty}">
-                            <label class="control-label col-sm-2"
-                                   for="royalpayindustry">*RoyalPay Industry</label>
-                            <div class="col-sm-8" >
-                                <input class="form-control" id="royalpayindustry" required
-                                       name="royalpayindustry" readonly
-                                       ng-model="partner.royalpayindustry|partner_royalpay_industry"
-                                       multi-level-select-popup="royalpayindustry"
-                                       on-select="onRoyalPayIndustrySelect($selected)">
-                                <div ng-messages="partnerForm.royalpay_label.$error"
-                                     ng-if="partnerForm.royalpay_label.$dirty">
-                                    <p class="small text-danger" ng-message="required">Required
-                                        Field</p>
+                    <div class="panel panel-default">
+                        <div class="panel-heading" style="color: #333;background-color: #f5f5f5;border-color: #ddd;">
+                            Industry
+                        </div>
+                        <div class="panel-body form-horizontal">
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.royalpay_label.$invalid && partnerForm.royalpay_label.$dirty}">
+                                <label class="control-label col-sm-2"
+                                       for="royalpayindustry">*RoyalPay Industry</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" id="royalpayindustry" required
+                                           name="royalpayindustry" readonly
+                                           ng-model="partner.royalpayindustry|partner_royalpay_industry"
+                                           multi-level-select-popup="royalpayindustry"
+                                           on-select="onRoyalPayIndustrySelect($selected)">
+                                    <div ng-messages="partnerForm.royalpay_label.$error"
+                                         ng-if="partnerForm.royalpay_label.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
 
-                        <div class="form-group"
-                             ng-class="{'has-error':partnerForm.jdindustry.$invalid && partnerForm.jdindustry.$dirty}">
-                            <label class="control-label col-sm-2" for="jdindustry-input">
-                                *JDPay Industry</label>
-                            <div class="col-sm-8">
-                                <select class="form-control" name="jdindustry"
-                                        ng-model="partner.jdindustry"
-                                        id="jdindustry-input" required
-                                        ng-options="industry.value as industry.label for industry in jdindustry">
-                                    <option value="">Please Choose</option>
-                                </select>
-                                <div ng-messages="partnerForm.jdindustryindustry.$error"
-                                     ng-if="partnerForm.jdindustryindustry.$dirty">
-                                    <p class="small text-danger" ng-message="required">Required
-                                        Field</p>
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.jdindustry.$invalid && partnerForm.jdindustry.$dirty}">
+                                <label class="control-label col-sm-2" for="jdindustry-input">
+                                    *JDPay Industry</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="jdindustry"
+                                            ng-model="partner.jdindustry"
+                                            id="jdindustry-input" required
+                                            ng-options="industry.value as industry.label for industry in jdindustry">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="partnerForm.jdindustryindustry.$error"
+                                         ng-if="partnerForm.jdindustryindustry.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
 
 
-                        <div class="form-group"
-                             ng-class="{'has-error':partnerForm.industry.$invalid && partnerForm.industry.$dirty}">
-                            <label class="control-label col-sm-2" for="industry-input">
-                                *Wechat Industry</label>
-                            <div class="col-sm-8">
-                                <select class="form-control" name="industry"
-                                        ng-model="partner.industry"
-                                        id="industry-input" required
-                                        ng-options="industry.value as industry.label for industry in industries">
-                                    <option value="">Please Choose</option>
-                                </select>
-                                <div ng-messages="partnerForm.industry.$error"
-                                     ng-if="partnerForm.industry.$dirty">
-                                    <p class="small text-danger" ng-message="required">Required
-                                        Field</p>
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.industry.$invalid && partnerForm.industry.$dirty}">
+                                <label class="control-label col-sm-2" for="industry-input">
+                                    *Wechat Industry</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="industry"
+                                            ng-model="partner.industry"
+                                            id="industry-input" required
+                                            ng-options="industry.value as industry.label for industry in industries">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="partnerForm.industry.$error"
+                                         ng-if="partnerForm.industry.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
 
-                        <div class="form-group"
-                             ng-class="{'has-error':partnerForm.alipay_category.$invalid && partnerForm.alipay_category.$dirty}">
-                            <label class="control-label col-sm-2"
-                                   for="alipay_category">*Alipay Category</label>
-                            <div class="col-sm-8" >
-                                <input class="form-control" id="alipay_category" required
-                                       name="alipay_category" readonly
-                                       ng-model="partner.alipayindustry|partner_alipay_industry"
-                                       multi-level-select-popup="alipayMccCategory"
-                                       on-select="onAlipayMccSelect($selected)">
-                                <div ng-messages="partnerForm.alipay_category.$error"
-                                     ng-if="partnerForm.alipay_category.$dirty">
-                                    <p class="small text-danger" ng-message="required">Required
-                                        Field</p>
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.alipay_category.$invalid && partnerForm.alipay_category.$dirty}">
+                                <label class="control-label col-sm-2"
+                                       for="alipay_category">*Alipay Category</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" id="alipay_category" required
+                                           name="alipay_category" readonly
+                                           ng-model="partner.alipayindustry|partner_alipay_industry"
+                                           multi-level-select-popup="alipayMccCategory"
+                                           on-select="onAlipayMccSelect($selected)">
+                                    <div ng-messages="partnerForm.alipay_category.$error"
+                                         ng-if="partnerForm.alipay_category.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
                                 </div>
-                            </div>
 
-                        </div>
+                            </div>
 
-                        <div class="form-group" ng-if="('10'|withRole) || ('1'|withRole)">
-                            <label class="control-label col-sm-2"
-                                   for="hf_category">HF Industry</label>
-                            <div class="col-sm-8" >
-                                <input class="form-control" id="hf_category" required
-                                       name="hf_label" readonly
-                                       ng-model="partner.hfindustry|partner_hf_industry"
-                                       multi-level-select-popup="hfindustry"
-                                       on-select="onHfIndustrySelect($selected)">
+                            <div class="form-group" ng-if="('10'|withRole) || ('1'|withRole)">
+                                <label class="control-label col-sm-2"
+                                       for="hf_category">HF Industry</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" id="hf_category" required
+                                           name="hf_label" readonly
+                                           ng-model="partner.hfindustry|partner_hf_industry"
+                                           multi-level-select-popup="hfindustry"
+                                           on-select="onHfIndustrySelect($selected)">
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
-            </div>
 
-        </div>
+            </div>
 
             <div class="btn-group margin-bottom margin-top">
                 <button class="btn btn-success" type="button" ng-click="save(partnerForm)">Save
diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html
index ca13b7bad..fa8e2f279 100644
--- a/src/main/ui/static/payment/partner/templates/partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/partner_detail.html
@@ -28,7 +28,8 @@
         width: 95%;
         float: left;
     }
-    .img-size{
+
+    .img-size {
         height: 100px;
         margin-left: 20px;
     }
@@ -39,7 +40,8 @@
         <i ng-if="partner.parent_client_id" class="fa fa-sitemap" title="Sub Partner"></i>
         <a class="text-primary" ng-if="'00001'|withRole" title="Mock Login"
            ng-href="/global/userstatus/current_manager/clients/{{partner.client_moniker}}/auth" target="_blank"><i
-                class="fa fa-share"></i></a><span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
+                class="fa fa-share"></i></a><span ng-if="partner.is_valid==0"
+                                                  ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
     </h1>
     <ol class="breadcrumb">
         <li>
@@ -61,24 +63,26 @@
                       style="color: green">(The Partner Using Green Channel Now!)</span>
                 【目前状态】-
                 <b ng-if="partner.source==4">
-                   <span ng-if="!partner.approve_result">(自助申请)资料完善中</span>
-                   <span ng-if="partner.approve_result==1">(自助申请)已开通</span>
-                   <span ng-if="partner.approve_result==2">(自助申请)快速开通等待提交合规材料</span>
-                   <span ng-if="partner.approve_result==3">(自助申请)待审核（材料已提交）</span>
+                    <span ng-if="!partner.approve_result">(自助申请)资料完善中</span>
+                    <span ng-if="partner.approve_result==1">(自助申请)已开通</span>
+                    <span ng-if="partner.approve_result==2">(自助申请)快速开通等待提交合规材料</span>
+                    <span ng-if="partner.approve_result==3">(自助申请)待审核（材料已提交）</span>
                 </b>
                 <b ng-if="partner.source!=4">
-                <span ng-if="!partner.open_status">资料完善中</span>
-                <span ng-if="partner.open_status==1">待审核（合同制作中）</span>
-                <span ng-if="partner.open_status==2">合同制作完成</span>
-                <span ng-if="partner.open_status==3">BD处理中</span>
-                <span ng-if="partner.open_status==4">待审核（合规文件已提交）</span>
-                <span ng-if="partner.open_status==5">通过</span>
-                <span ng-if="partner.open_status==0">不通过</span>
-                <span ng-if="partner.open_status==10">绿色通道申请中</span>
+                    <span ng-if="!partner.open_status">资料完善中</span>
+                    <span ng-if="partner.open_status==1">待审核（合同制作中）</span>
+                    <span ng-if="partner.open_status==2">合同制作完成</span>
+                    <span ng-if="partner.open_status==3">BD处理中</span>
+                    <span ng-if="partner.open_status==4">待审核（合规文件已提交）</span>
+                    <span ng-if="partner.open_status==5">通过</span>
+                    <span ng-if="partner.open_status==0">不通过</span>
+                    <span ng-if="partner.open_status==10">绿色通道申请中</span>
                 </b>
                 <span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
             </h3>
-            <button ng-if="!partner.is_valid" type="button" class="btn btn-success" style="float:right;" ng-click="revertClient()">Revert</button>
+            <button ng-if="!partner.is_valid" type="button" class="btn btn-success" style="float:right;"
+                    ng-click="revertClient()">Revert
+            </button>
         </div>
         <div class="box-body" ng-if="partner.is_valid==1">
             <div ng-if="partner.open_status != 5 && partner.open_status!=10">
@@ -130,16 +134,22 @@
                     <small ng-repeat="log in partner.audit_logs">
                         <i class="fa fa-arrow-right" aria-hidden="true"></i>
                         <div class="btn-group-vertical">
-                            <button type="button" class="btn btn-xs btn-primary" ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">{{log.remark}}</button>
-                            <button type="button" class="btn btn-xs btn-primary" ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">{{log.operator}} | {{log.create_time}}</button>
+                            <button type="button" class="btn btn-xs btn-primary"
+                                    ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">
+                                {{log.remark}}
+                            </button>
+                            <button type="button" class="btn btn-xs btn-primary"
+                                    ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">
+                                {{log.operator}} | {{log.create_time}}
+                            </button>
                         </div>
                     </small>
                 </div>
             </div>
         </div>
     </div>
-    <div> <a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{Export()}}">
-        <i class="fa fa-download" ></i>制作临时合同</a>
+    <div><a role="button" class="btn-group btn btn-warning" type="button" ng-href="{{Export()}}">
+        <i class="fa fa-download"></i>制作临时合同</a>
     </div>
 
     <div class="box" ng-if="('100'|withRole) && partner.show_all_permission"
@@ -200,8 +210,14 @@
                     <small ng-repeat="log in partner.audit_logs">
                         <i class="fa fa-arrow-right" aria-hidden="true" style="margin-top: 5px"></i>
                         <div class="btn-group-vertical" style="margin-top: 5px">
-                            <button type="button" class="btn btn-xs btn-primary" ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">{{log.remark}}</button>
-                            <button type="button" class="btn btn-xs btn-primary" ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">{{log.operator}} | {{log.create_time}}</button>
+                            <button type="button" class="btn btn-xs btn-primary"
+                                    ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">
+                                {{log.remark}}
+                            </button>
+                            <button type="button" class="btn btn-xs btn-primary"
+                                    ng-class="{'btn-danger':log.remark.indexOf('打回')>-1,'btn-success':log.open_status_to==5||(log.open_status_from==10 && log.open_status_to==1)}">
+                                {{log.operator}} | {{log.create_time}}
+                            </button>
                         </div>
                     </small>
                 </div>
@@ -235,7 +251,8 @@
                     <li ui-sref-active="active" ng-if="partner.show_all_permission && partner.is_valid==1">
                         <a ui-sref=".accounts">Partner Accounts</a>
                     </li>
-                    <li ui-sref-active="active" ng-if="partner.parent_client_id==null && partner.show_all_permission && partner.is_valid==1">
+                    <li ui-sref-active="active"
+                        ng-if="partner.parent_client_id==null && partner.show_all_permission && partner.is_valid==1">
                         <a ui-sref=".subpartners">Subpartners</a>
                     </li>
                     <li ui-sref-active="active" ng-if="false && partner.is_valid==1">
@@ -257,7 +274,8 @@
                         <a ui-sref=".settlement({clientMoniker:partner.client_moniker})">Settlement</a>
                     </li>
 
-                    <li ui-sref-active="active" ng-if="partner.show_all_permission && partner.is_valid==1 && partner.surcharge_mode=='distributed'">
+                    <li ui-sref-active="active"
+                        ng-if="partner.show_all_permission && partner.is_valid==1 && partner.surcharge_mode=='distributed'">
                         <a ui-sref=".surcharge_account({clientMoniker:partner.client_moniker})">Surcharge Account</a>
                     </li>
 
@@ -298,7 +316,8 @@
                                                 <a ui-sref="partners.detail({clientMoniker:partner.parent_client.client_moniker})"
                                                    ng-bind="partner.parent_client.client_moniker"></a>)
                                             </span>
-                                            <span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
+                                            <span ng-if="partner.is_valid==0"
+                                                  ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
                                         </p>
                                     </div>
                                 </div>
@@ -307,7 +326,8 @@
 
                                     <div class="col-sm-10">
                                         <p class="form-control-static pull-left" ng-bind="partner.company_name"></p>
-                                        <p class="form-control-static pull-left" ng-if="isComplianceOfCompanyName && partner.open_status"
+                                        <p class="form-control-static pull-left"
+                                           ng-if="isComplianceOfCompanyName && partner.open_status"
                                            style="margin-left: 10px;font-weight: 700;color: red;">
                                             注意:（微信渠道可能不合规）
                                         </p>
@@ -318,7 +338,8 @@
 
                                     <div class="col-sm-10">
                                         <p class="form-control-static pull-left" ng-bind="partner.short_name"></p>
-                                        <p class="form-control-static pull-left" ng-if="isComplianceOfShortName && partner.open_status"
+                                        <p class="form-control-static pull-left"
+                                           ng-if="isComplianceOfShortName && partner.open_status"
                                            style="margin-left: 10px;font-weight: 700;color: red;">
                                             注意:（微信渠道可能不合规）
                                         </p>
@@ -333,13 +354,14 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-2">Store Name</label>
-                                <div class="col-sm-10">
-                                    <p class="form-control-static pull-left" ng-bind="partner.store_name"></p>
-                                    <p class="form-control-static pull-left" ng-if="isComplianceOfShortName && partner.open_status"
-                                       style="margin-left: 10px;font-weight: 700;color: red;">
-                                        注意:（微信渠道可能不合规）
-                                    </p>
-                                </div>
+                                    <div class="col-sm-10">
+                                        <p class="form-control-static pull-left" ng-bind="partner.store_name"></p>
+                                        <p class="form-control-static pull-left"
+                                           ng-if="isComplianceOfShortName && partner.open_status"
+                                           style="margin-left: 10px;font-weight: 700;color: red;">
+                                            注意:（微信渠道可能不合规）
+                                        </p>
+                                    </div>
                                 </div>
 
                                 <div class="form-group">
@@ -348,7 +370,8 @@
                                     <div class="col-sm-10">
                                         <p class="form-control-static pull-left"
                                            ng-bind="partner.business_structure|business_structure"></p>
-                                        <p class="form-control-static pull-left" ng-if="isComplianceOfBusinessStructure && partner.open_status"
+                                        <p class="form-control-static pull-left"
+                                           ng-if="isComplianceOfBusinessStructure && partner.open_status"
                                            style="margin-left: 10px;font-weight: 700;color: red;">
                                             注意:（微信渠道可能不合规）
                                         </p>
@@ -399,7 +422,7 @@
 
                                     <div class="col-sm-3 col-xs-5" ng-if="partner.store_photo"><em>2:</em>&nbsp;
                                         <div>
-                                            <a class="thumbnail" target="_blank" ng-href="{{partner.store_photo}}" >
+                                            <a class="thumbnail" target="_blank" ng-href="{{partner.store_photo}}">
                                                 <img ng-src="{{partner.store_photo}}" style="max-height: 100px">
                                             </a>
                                         </div>
@@ -470,7 +493,8 @@
                                                 <th>End Date</th>
                                                 <th>BD Name</th>
                                                 <th>Proportion</th>
-                                                <th ng-if="('00010'|withRole) || (('1000000000000'|withRole) && partner.show_all_permission)">Operation
+                                                <th ng-if="('00010'|withRole) || (('1000000000000'|withRole) && partner.show_all_permission)">
+                                                    Operation
                                                 </th>
                                             </tr>
                                             </thead>
@@ -501,9 +525,568 @@
                         </div>
                     </div>
                     <!--end 商户基本资料-->
+                    <div class="panel panel-default">
+                        <div class="panel-heading">Merchant Payment Scenario</div>
+                        <div class="panel-body">
+                            <div class="form-horizontal">
+                                <div class="form-group">
+                                    <label class="control-label col-sm-2">
+                                        Merchant Payment Scenario Type</label>
+                                    <div class="col-sm-8">
+                                        <p class="form-control-static"
+                                           ng-bind="partner.client_pay_type">
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-2">Merchant Payment Scenario Description</label>
+                                    <div class="col-sm-10">
+                                        <p class="form-control-static" ng-bind="partner.client_pay_desc"></p>
+                                    </div>
+                                </div>
+                                <!--<div ng-if="partner.client_pay_type=='online' || partner.client_pay_type=='all'">-->
+                                    <!--<div class="form-group">-->
+                                        <!--<label class="control-label col-sm-2">-->
+                                            <!--Website</label>-->
+                                        <!--<div class="col-sm-8">-->
+                                            <!--<p class="form-control-static"-->
+                                               <!--ng-bind="partner.online_website">-->
+                                            <!--</p>-->
+                                        <!--</div>-->
+                                    <!--</div>-->
+                                    <!--<div class="form-group">-->
+                                        <!--<label class="control-label col-sm-2">-->
+                                            <!--公众号名称</label>-->
+                                        <!--<div class="col-sm-8">-->
+                                            <!--<p class="form-control-static"-->
+                                               <!--ng-bind="partner.online_public_account">-->
+                                            <!--</p>-->
+                                        <!--</div>-->
+                                    <!--</div>-->
+                                    <!--<div class="form-group">-->
+                                        <!--<label class="control-label col-sm-2">-->
+                                            <!--Mini Program Name</label>-->
+                                        <!--<div class="col-sm-8">-->
+                                            <!--<p class="form-control-static"-->
+                                               <!--ng-bind="partner.online_mini_program">-->
+                                            <!--</p>-->
+                                        <!--</div>-->
+                                    <!--</div>-->
+                                    <!--<div class="form-group">-->
+                                        <!--<label class="control-label col-sm-2">-->
+                                            <!--APP Name</label>-->
+                                        <!--<div class="col-sm-8">-->
+                                            <!--<p class="form-control-static"-->
+                                               <!--ng-bind="partner.online_app">-->
+                                            <!--</p>-->
+                                        <!--</div>-->
+                                    <!--</div>-->
+                                <!--</div>-->
+                                <!--<div ng-if="partner.client_pay_type=='offline' || partner.client_pay_type=='all'">-->
+                                    <!--<div class="form-group">-->
+                                        <!--<label class="control-label col-sm-2">Offline Scene Of Merchants</label>-->
+                                        <!--<div class="col-sm-8">-->
+                                            <!--<p class="form-control-static"-->
+                                               <!--ng-bind="partner.client_offline_desc | partner_offline_desc">-->
+                                            <!--</p>-->
+                                        <!--</div>-->
+                                    <!--</div>-->
+                                <!--</div>-->
+                            </div>
+                        </div>
+
+                        <div class="panel panel-default">
+                            <div class="panel-heading">Alipay Information &nbsp;<em class="small"><b>(Optional)</b></em>
+                            </div>
+                            <div class="panel-body">
+                                <div class="form-horizontal">
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-2">
+                                            Business Hours</label>
+                                        <div class="col-sm-8">
+                                            <input type="text" class="form-control" ng-model="partner.business_hours">
+                                            <p class="small text-info">
+                                                eg:Monday-Friday 09:00-20:00,Saturday-Sunday 10:00-22:00</p>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-2">
+                                            Merchant Tag<em class="small">(Chinese)</em></label>
+                                        <div class="col-sm-8">
+                                            <input type="text" class="form-control" ng-model="partner.merchant_tag">
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-2">
+                                            Merchant Introduction<em class="small">(Chinese)</em></label>
+                                        <div class="col-sm-8">
+                                            <textarea class="form-control"
+                                                      ng-model="partner.merchant_introduction"></textarea>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-2">
+                                            Video Introduction<br><em class="small">(youtube link)</em></label>
+                                        <div class="col-sm-8">
+                                            <input type="text" class="form-control"
+                                                   ng-model="partner.merchant_video_url">
+                                            <p class="small text-info">eg:https://www.baidu.com</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <!--支付宝资料-->
+                        <div class="panel panel-default">
+                            <div class="panel-heading">Contact Information</div>
+                            <div class="panel-body">
+                                <div class="form-horizontal">
+                                    <div class="form-group"
+                                         ng-class="{'has-error':partnerForm.contact_person.$invalid && partnerForm.contact_person.$dirty}">
+                                        <label class="control-label col-sm-2" for="contact_person-input">*
+                                            Contact Person
+                                            Name</label>
+                                        <div class="col-sm-8">
+                                            <input class="form-control" ng-model="partner.contact_person"
+                                                   required
+                                                   name="contact_person"
+                                                   id="contact_person-input" maxlength="50">
+                                            <div ng-messages="partnerForm.contact_person.$error"
+                                                 ng-if="partnerForm.contact_person.$dirty">
+                                                <p class="small text-danger" ng-message="required">Required
+                                                    Field</p>
+                                                <p class="small text-danger" ng-message="maxlength">Less
+                                                    Than 50
+                                                    Characters(including symbols and spaces)</p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="form-group"
+                                         ng-class="{'has-error':partnerForm.contact_phone_p.$invalid && partnerForm.contact_phone_p.$dirty}">
+                                        <label class="control-label col-sm-2" for="contact-phone-p-input">*
+                                            Phone</label>
+                                        <!-- <div class="col-sm-8">
+                                             <input type="text" class="form-control" ng-model="partner.contact_phone" required
+                                                    name="contact_phone" id="contact-phone-input" maxlength="20">
+                                         </div>
+                                         <div ng-messages="partnerForm.contact_phone.$error"
+                                              ng-if="partnerForm.contact_phone.$dirty">
+                                             <p class="small text-danger" ng-message="required">Required Field</p>
+                                             <p class="small text-danger" ng-message="maxlength">Less Than 20
+                                                 Characters(including symbols and spaces)</p>
+                                         </div>-->
+
+                                        <div class="col-sm-2">
+                                            <div class="input-group">
+                                                <div class="input-group-addon">+</div>
+                                                <input class="form-control" required type="text"
+                                                       ng-model="partner.contact_phone_c"
+                                                       name="contact_phone_c" id="contact-phone-c-input"
+                                                       maxlength="3" minlength="1"
+                                                       placeholder="country code">
+                                            </div>
+
+                                            <div ng-messages="partnerForm.contact_phone_c.$error"
+                                                 ng-if="partnerForm.contact_phone_c.$dirty">
+                                                <p class="small text-danger" ng-message="required">Required
+                                                    Field</p>
+                                                <p class="small text-danger" ng-message="maxlength">Less
+                                                    Than 20 Characters</p>
+                                            </div>
+                                        </div>
+                                        <div class="col-sm-2">
+                                            <input class="form-control" type="text"
+                                                   ng-model="partner.contact_phone_a"
+                                                   title="eg:3,当为手机号、服务电话时，可以不填"
+                                                   name="contact_phone_a" id="contact-phone-a-input"
+                                                   maxlength="2" placeholder="area code">
+                                            <div ng-messages="partnerForm.contact_phone_a.$error"
+                                                 ng-if="partnerForm.contact_phone_a.$dirty">
+                                                <p class="small text-danger" ng-message="maxlength">Less
+                                                    Than 2 Characters</p>
+                                            </div>
+                                        </div>
+                                        <div class="col-sm-4">
+                                            <input class="form-control" required type="text"
+                                                   ng-model="partner.contact_phone_p"
+                                                   name="contact_phone_p" id="contact-phone-p-input"
+                                                   maxlength="11" placeholder="phone number">
+                                            <div ng-messages="partnerForm.contact_phone_p.$error"
+                                                 ng-if="partnerForm.contact_phone_p.$dirty">
+                                                <p class="small text-danger" ng-message="required">Required
+                                                    Field</p>
+                                                <p class="small text-danger" ng-message="maxlength">Less
+                                                    Than 11 Characters</p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="form-group"
+                                         ng-class="{'has-error':partnerForm.contact_email.$invalid && partnerForm.contact_email.$dirty}">
+                                        <label class="control-label col-sm-2" for="contact-email-id">*
+                                            E-mail</label>
+                                        <div class="col-sm-8">
+                                            <input class="form-control" ng-model="partner.contact_email"
+                                                   required
+                                                   name="contact_email" id="contact-email-id"
+                                                   maxlength="50">
+                                        </div>
+                                        <div ng-messages="partnerForm.contact_email.$error"
+                                             ng-if="partnerForm.contact_email.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                            <p class="small text-danger" ng-message="maxlength">Less Than 50
+                                                Characters(including symbols and spaces)</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <!--end 商户联系资料-->
+                        <div class="panel panel-default">
+                            <div class="panel-heading">Address Information</div>
+                            <div class="panel-body">
+                                <div class="form-horizontal">
+                                    <div class="form-group col-sm-6"
+                                         ng-class="{'has-error':partnerForm.address.$invalid && partnerForm.address.$dirty}">
+                                        <label class="control-label col-sm-4" for="address-input">*
+                                            Address</label>
+                                        <div class="col-sm-8">
+                                <textarea class="form-control" ng-model="partner.address"
+                                          name="address"
+                                          id="address-input" maxlength="200" required></textarea>
+                                            <div ng-messages="partnerForm.address.$error"
+                                                 ng-if="partnerForm.address.$dirty">
+                                                <p class="small text-danger" ng-message="maxlength">Less
+                                                    Than 200
+                                                    Characters(including symbols and spaces)</p>
+                                                <p class="small text-danger" ng-message="required">Required
+                                                    Field</p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-sm-6"
+                                         ng-class="{'has-error':partnerForm.suburb.$invalid && partnerForm.suburb.$dirty}">
+                                        <label class="control-label col-sm-4" for="suburb-input">*
+                                            Suburb</label>
+                                        <div class="col-sm-8">
+                                            <input class="form-control" ng-model="partner.suburb"
+                                                   name="suburb"
+                                                   id="suburb-input" maxlength="50" required>
+                                            <div ng-messages="partnerForm.suburb.$error"
+                                                 ng-if="partnerForm.suburb.$dirty">
+                                                <p class="small text-danger" ng-message="maxlength">Less
+                                                    Than 50
+                                                    Characters(including symbols and spaces)</p>
+                                                <p class="small text-danger" ng-message="required">Required
+                                                    Field</p>
+                                            </div>
+                                            <!--</div>-->
+                                            <!--<select class="form-control" name="suburb" required ng-model="partner.suburb"-->
+                                            <!--id="suburb-input"-->
+                                            <!--ng-options="t2c.key as t2c.value for t2c in t2city_map">-->
+                                            <!--<option value="">Please Choose</option>-->
+                                            <!--</select>-->
+                                            <!--<div ng-messages="partnerForm.suburb.$error" ng-if="partnerForm.suburb.$dirty">-->
+                                            <!--<p class="small text-danger" ng-message="required">Required Field</p>-->
+                                            <!--</div>-->
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-sm-6"
+                                         ng-class="{'has-error':partnerForm.postcode.$invalid && partnerForm.postcode.$dirty}">
+                                        <label class="control-label col-sm-4" for="postcode-input">*
+                                            PostCode</label>
+                                        <div class="col-sm-8">
+                                            <input class="form-control" ng-model="partner.postcode"
+                                                   name="postcode"
+                                                   id="postcode-input" maxlength="10" required>
+                                            <div ng-messages="partnerForm.postcode.$error"
+                                                 ng-if="partnerForm.postcode.$dirty">
+                                                <p class="small text-danger" ng-message="maxlength">Less
+                                                    Than 10
+                                                    Characters(including symbols and spaces)</p>
+                                                <p class="small text-danger" ng-message="required">Required
+                                                    Field</p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-sm-6"
+                                         ng-class="{'has-error':partnerForm.state.$invalid && partnerForm.state.$dirty}">
+                                        <label class="control-label col-sm-4" for="state-input">*
+                                            State</label>
+                                        <div class="col-sm-8">
+                                            <!--<input class="form-control" ng-model="partner.state" name="state" id="state-input"-->
+                                            <!--maxlength="20">-->
+                                            <!--<div ng-messages="partnerForm.state.$error" ng-if="partnerForm.state.$dirty">-->
+                                            <!--<p class="small text-danger" ng-message="maxlength">Less Than 20-->
+                                            <!--Characters(including symbols and spaces)</p>-->
+                                            <!--</div>-->
+                                            <select class="form-control" name="state" required
+                                                    ng-model="partner.state"
+                                                    id="state-input"
+                                                    ng-options="state.value as state.label for state in states">
+                                                <option value="">Please Choose</option>
+                                            </select>
+                                            <div ng-messages="partnerForm.state.$error"
+                                                 ng-if="partnerForm.state.$dirty">
+                                                <p class="small text-danger" ng-message="required">Required
+                                                    Field</p>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                    <div class="form-group col-sm-6"
+                                         ng-class="{'has-error':partnerForm.country.$invalid && partnerForm.country.$dirty}">
+                                        <label class="control-label col-sm-4" for="country-input">*
+                                            Country</label>
+                                        <div class="col-sm-8">
+                                            <input class="form-control"
+                                                   ng-init="partner.country=partner.country||'AUS'"
+                                                   ng-model="partner.country" name="country"
+                                                   id="country-input" maxlength="20" required
+                                                   placeholder="AUS" readonly="readonly">
+                                            <div ng-messages="partnerForm.country.$error"
+                                                 ng-if="partnerForm.country.$dirty">
+                                                <p class="small text-danger" ng-message="maxlength">Less
+                                                    Than 20
+                                                    Characters(including symbols and spaces)</p>
+                                                <p class="small text-danger" ng-message="required">Required
+                                                    Field</p>
+                                            </div>
+                                            <!--选择框-->
+                                            <!--<select class="form-control" name="country" required ng-model="partner.country"-->
+                                            <!--id="country-input"-->
+                                            <!--ng-options="country.value as country.label for country in countries">-->
+                                            <!--<option value="">Please Choose</option>-->
+                                            <!--</select>-->
+                                            <!--<div ng-messages="partnerForm.country.$error" ng-if="partnerForm.country.$dirty">-->
+                                            <!--<p class="small text-danger" ng-message="required">Required Field</p>-->
+                                            <!--</div>-->
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-2"
+                                               for="tz-select">TimeZone</label>
+                                        <div class="col-sm-9">
+                                            <select class="form-control" name="timezone"
+                                                    ng-model="partner.timezone"
+                                                    id="tz-select"
+                                                    ng-options="tz.key as tz.detail for tz in timezones">
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="panel panel-default">
+                            <div class="panel-heading" style="font-size: larger">Location
+                                <span id="editmap" hidden>true</span>
+                                <span id="add_view" hidden>true</span>
+                            </div>
+                            <div class="form-group">
+                                <div class="embed-responsive" style="height: 300px;">
+                                    <iframe id="merchant_detail" name="merchant_detail" class="embed-responsive-item"
+                                            src="one_locations.html"></iframe>
+                                </div>
+                            </div>
+                        </div>
+                        <!--<div class="panel panel-info">
+                            <div class="panel-heading">Alipay Parameters</div>
+                            <div class="panel-body form-horizontal">
+                                <div class="form-group col-sm-6"
+                                     ng-class="{'has-error':partnerForm.alipay_category.$invalid && partnerForm.alipay_category.$dirty}">
+                                    <label class="control-label col-sm-4"
+                                           for="alipay_category">*Category</label>
+                                    <div class="col-sm-8" >
+                                        <input class="form-control" id="alipay_category" required
+                                               name="alipay_category" readonly
+                                               ng-model="partner.alipay_category"
+                                               multi-level-select-popup="alipayMccCategory"
+                                               on-select="onAlipayMccSelect($selected)">
+                                        <div ng-messages="partnerForm.alipay_category.$error"
+                                             ng-if="partnerForm.alipay_category.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+
+                        <div class="panel panel-info">
+                            <div class="panel-heading" style="background:#62b900">wechat Parameters</div>
+                            <div class="panel-body form-horizontal">
+                                <div class="form-group"
+                                     ng-class="{'has-error':partnerForm.industry.$invalid && partnerForm.industry.$dirty}">
+                                    <label class="control-label col-sm-2" for="industry-input">
+                                        *Industry</label>
+                                    <div class="col-sm-8">
+                                        <select class="form-control" name="industry"
+                                                ng-model="partner.industry"
+                                                id="industry-input" required
+                                                ng-options="industry.value as industry.label for industry in industries">
+                                            <option value="">Please Choose</option>
+                                        </select>
+                                        <div ng-messages="partnerForm.industry.$error"
+                                             ng-if="partnerForm.industry.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+
+                        <div class="panel panel-info">
+                            <div class="panel-heading" style="background:#d82d2d">JD Parameters</div>
+                            <div class="panel-body form-horizontal">
+                                <div class="form-group"
+                                     ng-class="{'has-error':partnerForm.jdindustry.$invalid && partnerForm.jdindustry.$dirty}">
+                                    <label class="control-label col-sm-2" for="jdindustry-input">
+                                        *Industry</label>
+                                    <div class="col-sm-8">
+                                        <select class="form-control" name="jdindustry"
+                                                ng-model="partner.jdindustry"
+                                                id="jdindustry-input" required
+                                                ng-options="industry.value as industry.label for industry in jdindustry">
+                                            <option value="">Please Choose</option>
+                                        </select>
+                                        <div ng-messages="partnerForm.jdindustry.$error"
+                                             ng-if="partnerForm.jdindustry.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="panel panel-info">
+                            <div class="panel-heading" style="background:#f06010;color: #f6f6f6;">RoyalPay Parameters</div>
+                            <div class="panel-body form-horizontal">
+                                <div class="form-group"
+                                     ng-class="{'has-error':partnerForm.royalpayindustry.$invalid && partnerForm.royalpayindustry.$dirty}">
+                                    <label class="control-label col-sm-2" for="royalpayindustry-input">
+                                        *Industry</label>
+                                    <div class="col-sm-8">
+                                        <select class="form-control" name="royalpayindustry"
+                                                ng-model="partner.royalpayindustry"
+                                                id="royalpayindustry-input" required
+                                                ng-options="industry.value as industry.label for industry in royalpayindustry">
+                                            <option value="">Please Choose</option>
+                                        </select>
+                                        <div ng-messages="partnerForm.royalpayindustry.$error"
+                                             ng-if="partnerForm.royalpayindustry.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>-->
+
+
+                        <div class="panel panel-default">
+                            <div class="panel-heading"
+                                 style="color: #333;background-color: #f5f5f5;border-color: #ddd;">
+                                Industry
+                            </div>
+                            <div class="panel-body form-horizontal">
+                                <div class="form-group"
+                                     ng-class="{'has-error':partnerForm.royalpay_label.$invalid && partnerForm.royalpay_label.$dirty}">
+                                    <label class="control-label col-sm-2"
+                                           for="royalpayindustry">*RoyalPay Industry</label>
+                                    <div class="col-sm-8">
+                                        <input class="form-control" id="royalpayindustry" required
+                                               name="royalpayindustry" readonly
+                                               ng-model="partner.royalpayindustry|partner_royalpay_industry"
+                                               multi-level-select-popup="royalpayindustry"
+                                               on-select="onRoyalPayIndustrySelect($selected)">
+                                        <div ng-messages="partnerForm.royalpay_label.$error"
+                                             ng-if="partnerForm.royalpay_label.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="form-group"
+                                     ng-class="{'has-error':partnerForm.jdindustry.$invalid && partnerForm.jdindustry.$dirty}">
+                                    <label class="control-label col-sm-2" for="jdindustry-input">
+                                        *JDPay Industry</label>
+                                    <div class="col-sm-8">
+                                        <select class="form-control" name="jdindustry"
+                                                ng-model="partner.jdindustry"
+                                                id="jdindustry-input" required
+                                                ng-options="industry.value as industry.label for industry in jdindustry">
+                                            <option value="">Please Choose</option>
+                                        </select>
+                                        <div ng-messages="partnerForm.jdindustryindustry.$error"
+                                             ng-if="partnerForm.jdindustryindustry.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+                                    </div>
+                                </div>
+
+
+                                <div class="form-group"
+                                     ng-class="{'has-error':partnerForm.industry.$invalid && partnerForm.industry.$dirty}">
+                                    <label class="control-label col-sm-2" for="industry-input">
+                                        *Wechat Industry</label>
+                                    <div class="col-sm-8">
+                                        <select class="form-control" name="industry"
+                                                ng-model="partner.industry"
+                                                id="industry-input" required
+                                                ng-options="industry.value as industry.label for industry in industries">
+                                            <option value="">Please Choose</option>
+                                        </select>
+                                        <div ng-messages="partnerForm.industry.$error"
+                                             ng-if="partnerForm.industry.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="form-group"
+                                     ng-class="{'has-error':partnerForm.alipay_category.$invalid && partnerForm.alipay_category.$dirty}">
+                                    <label class="control-label col-sm-2"
+                                           for="alipay_category">*Alipay Category</label>
+                                    <div class="col-sm-8">
+                                        <input class="form-control" id="alipay_category" required
+                                               name="alipay_category" readonly
+                                               ng-model="partner.alipayindustry|partner_alipay_industry"
+                                               multi-level-select-popup="alipayMccCategory"
+                                               on-select="onAlipayMccSelect($selected)">
+                                        <div ng-messages="partnerForm.alipay_category.$error"
+                                             ng-if="partnerForm.alipay_category.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+                                    </div>
+
+                                </div>
+
+                                <div class="form-group" ng-if="('10'|withRole) || ('1'|withRole)">
+                                    <label class="control-label col-sm-2"
+                                           for="hf_category">HF Industry</label>
+                                    <div class="col-sm-8">
+                                        <input class="form-control" id="hf_category" required
+                                               name="hf_label" readonly
+                                               ng-model="partner.hfindustry|partner_hf_industry"
+                                               multi-level-select-popup="hfindustry"
+                                               on-select="onHfIndustrySelect($selected)">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
                     <!--支付宝资料-->
                     <div class="panel panel-default">
-                        <div class="panel-heading">Alipay Information &nbsp;<em class="small"><b>(Optional)</b></em></div>
+                        <div class="panel-heading">Alipay Information &nbsp;<em class="small"><b>(Optional)</b></em>
+                        </div>
                         <div class="panel-body">
                             <div class="form-horizontal">
                                 <div class="form-group">
@@ -561,13 +1144,16 @@
                                     <div class="col-sm-8">
                                         <p class="form-control-static">
                                             <span ng-bind="partner.contact_email"></span>
-                                            <a ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))" role="button"
+                                            <a ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))"
+                                               role="button"
                                                ng-click="resendApproveEmail()">
                                                 <i class="fa fa-envelope"></i> Resend Email
                                             </a>
                                             <span ng-if="('10'|withRole)">
-                                             <i style="cursor: pointer" ng-click="addSub()"  ng-if="!partner.unsubscribe" class="fa fa-star text-yellow"></i>
-                                             <i style="cursor: pointer" ng-click="removeSub()" ng-if="partner.unsubscribe"  class="fa fa-star-o text-yellow"></i>
+                                             <i style="cursor: pointer" ng-click="addSub()" ng-if="!partner.unsubscribe"
+                                                class="fa fa-star text-yellow"></i>
+                                             <i style="cursor: pointer" ng-click="removeSub()"
+                                                ng-if="partner.unsubscribe" class="fa fa-star-o text-yellow"></i>
                                         </span>
                                         </p>
                                     </div>
@@ -751,7 +1337,7 @@
                                 <div class="form-group">
                                     <label class="control-label col-sm-2">Alipay Category</label>
                                     <div class="col-sm-10">
-                                        <p class="form-control-static industry-p"ng-if="partner.alipayindustry">
+                                        <p class="form-control-static industry-p" ng-if="partner.alipayindustry">
                                             {{partner.alipayindustry|partner_alipay_industry}}
                                             &nbsp;&nbsp;&nbsp;({{partner.alipayindustry}})
                                         </p>
@@ -763,7 +1349,7 @@
                                 <div class="form-group" ng-if="partner.hfindustry&&(('10'|withRole) || ('1'|withRole))">
                                     <label class="control-label col-sm-2">HF Industry</label>
                                     <div class="col-sm-10">
-                                        <p class="form-control-static industry-p"ng-if="partner.hfindustry">
+                                        <p class="form-control-static industry-p" ng-if="partner.hfindustry">
                                             {{partner.hfindustry| partner_hf_industry}}
                                             &nbsp;&nbsp;&nbsp;({{partner.hfindustry}})
                                         </p>
diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html
index c9dd152d5..f5525f892 100644
--- a/src/main/ui/static/payment/partner/templates/partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/partner_edit.html
@@ -362,6 +362,596 @@
                     </div>
                 </div>
                 <!--end 商户基本资料-->
+                <div class="panel panel-default">
+                    <div class="panel-heading">Merchant Payment Scenario</div>
+                    <div class="panel-body">
+                        <div class="form-horizontal">
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.client_pay_type.$invalid && partnerForm.client_pay_type.$dirty}">
+                                <label class="control-label col-sm-2" for="client-pay-type-select">*
+                                    Merchant Payment Scenario Type</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" ng-model="partner.client_pay_type"
+                                            id="client-pay-type-select"
+                                            name="client_pay_type">
+                                        <option value="">Please Choose</option>
+                                        <option value="all">All</option>
+                                        <option value="online">线上</option>
+                                        <option value="offline">线下</option>
+                                    </select>
+                                    <div ng-messages="partnerForm.client_pay_type.$error"
+                                         ng-if="partnerForm.client_pay_type.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.client_pay_desc.$invalid && partnerForm.client_pay_desc.$dirty}">
+                                <label class="control-label col-sm-2" for="client-pay-desc-input">*
+                                    Merchant Payment Scenario Description</label>
+                                <div class="col-sm-8">
+                                <textarea class="form-control" required
+                                          ng-model="partner.client_pay_desc"
+                                          name="client_pay_desc" id="client-pay-desc-input"
+                                          maxlength="200"></textarea>
+                                    <p class="small text-info">
+                                        <i class="fa fa-info"></i> 例如：线下场景：门店（立牌、POS）、收银系统（选择品牌名称【ipos、银豹、aupos、其他】）、无门店</p>
+                                    <div ng-messages="partnerForm.client_pay_desc.$error"
+                                         ng-if="partnerForm.client_pay_desc.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Less
+                                            Than 200
+                                            Characters(including symbols and spaces)</p>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--<div ng-if="partner.client_pay_type=='online' || partner.client_pay_type=='all'">-->
+                                <!--<div class="form-group">-->
+                                    <!--<label class="control-label col-sm-2">-->
+                                        <!--Website</label>-->
+                                    <!--<div class="col-sm-8">-->
+                                        <!--<input type="text" class="form-control"-->
+                                               <!--ng-model="partner.online_website">-->
+                                    <!--</div>-->
+                                <!--</div>-->
+                                <!--<div class="form-group">-->
+                                    <!--<label class="control-label col-sm-2">-->
+                                        <!--公众号名称</label>-->
+                                    <!--<div class="col-sm-8">-->
+                                        <!--<input type="text" class="form-control"-->
+                                               <!--ng-model="partner.online_public_account">-->
+                                    <!--</div>-->
+                                <!--</div>-->
+                                <!--<div class="form-group">-->
+                                    <!--<label class="control-label col-sm-2">-->
+                                        <!--Mini Program Name</label>-->
+                                    <!--<div class="col-sm-8">-->
+                                        <!--<input type="text" class="form-control"-->
+                                               <!--ng-model="partner.online_mini_program">-->
+                                    <!--</div>-->
+                                <!--</div>-->
+                                <!--<div class="form-group">-->
+                                    <!--<label class="control-label col-sm-2">-->
+                                        <!--APP Name</label>-->
+                                    <!--<div class="col-sm-8">-->
+                                        <!--<input type="text" class="form-control"-->
+                                               <!--ng-model="partner.online_app">-->
+                                        <!--<p class="small text-info">-->
+                                            <!--<i class="fa fa-info"></i> 线上支付场景至少选择填一项</p>-->
+                                    <!--</div>-->
+
+                                <!--</div>-->
+                            <!--</div>-->
+                            <!--<div ng-if="partner.client_pay_type=='offline' || partner.client_pay_type=='all'">-->
+                                <!--<div class="form-group"-->
+                                     <!--ng-class="{'has-error':partnerForm.client_offline.$invalid && partnerForm.client_offline.$dirty}">-->
+                                    <!--<label class="control-label col-sm-2"-->
+                                           <!--for="client-offline-desc">*Offline Scene Of Merchants</label>-->
+                                    <!--<div class="col-sm-8">-->
+                                        <!--<input class="form-control" id="client-offline-desc" required-->
+                                               <!--name="client_offline" readonly-->
+                                               <!--ng-model="partner.client_offline_desc | partner_offline_desc"-->
+                                               <!--multi-level-select-popup="client_offline_select"-->
+                                               <!--on-select="onOfflineDescSelect($selected)">-->
+                                        <!--<div ng-messages="partnerForm.client_offline.$error"-->
+                                             <!--ng-if="partnerForm.client_offline.$dirty">-->
+                                            <!--<p class="small text-danger" ng-message="required">Required-->
+                                                <!--Field</p>-->
+                                        <!--</div>-->
+                                    <!--</div>-->
+                                <!--</div>-->
+                            <!--</div>-->
+
+                        </div>
+                    </div>
+
+                    <div class="panel panel-default">
+                        <div class="panel-heading">Alipay Information &nbsp;<em class="small"><b>(Optional)</b></em></div>
+                        <div class="panel-body">
+                            <div class="form-horizontal">
+                                <div class="form-group">
+                                    <label class="control-label col-sm-2">
+                                        Business Hours</label>
+                                    <div class="col-sm-8">
+                                        <input type="text" class="form-control" ng-model="partner.business_hours">
+                                        <p class="small text-info">
+                                            eg:Monday-Friday 09:00-20:00,Saturday-Sunday 10:00-22:00</p>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-2">
+                                        Merchant Tag<em class="small">(Chinese)</em></label>
+                                    <div class="col-sm-8">
+                                        <input type="text" class="form-control" ng-model="partner.merchant_tag">
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-2">
+                                        Merchant Introduction<em class="small">(Chinese)</em></label>
+                                    <div class="col-sm-8">
+                                        <textarea class="form-control" ng-model="partner.merchant_introduction"></textarea>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-2">
+                                        Video Introduction<br><em class="small">(youtube link)</em></label>
+                                    <div class="col-sm-8">
+                                        <input type="text" class="form-control" ng-model="partner.merchant_video_url">
+                                        <p class="small text-info">eg:https://www.baidu.com</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <!--支付宝资料-->
+                    <div class="panel panel-default">
+                        <div class="panel-heading">Contact Information</div>
+                        <div class="panel-body">
+                            <div class="form-horizontal">
+                                <div class="form-group"
+                                     ng-class="{'has-error':partnerForm.contact_person.$invalid && partnerForm.contact_person.$dirty}">
+                                    <label class="control-label col-sm-2" for="contact_person-input">*
+                                        Contact Person
+                                        Name</label>
+                                    <div class="col-sm-8">
+                                        <input class="form-control" ng-model="partner.contact_person"
+                                               required
+                                               name="contact_person"
+                                               id="contact_person-input" maxlength="50">
+                                        <div ng-messages="partnerForm.contact_person.$error"
+                                             ng-if="partnerForm.contact_person.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 50
+                                                Characters(including symbols and spaces)</p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group"
+                                     ng-class="{'has-error':partnerForm.contact_phone_p.$invalid && partnerForm.contact_phone_p.$dirty}">
+                                    <label class="control-label col-sm-2" for="contact-phone-p-input">*
+                                        Phone</label>
+                                    <!-- <div class="col-sm-8">
+                                         <input type="text" class="form-control" ng-model="partner.contact_phone" required
+                                                name="contact_phone" id="contact-phone-input" maxlength="20">
+                                     </div>
+                                     <div ng-messages="partnerForm.contact_phone.$error"
+                                          ng-if="partnerForm.contact_phone.$dirty">
+                                         <p class="small text-danger" ng-message="required">Required Field</p>
+                                         <p class="small text-danger" ng-message="maxlength">Less Than 20
+                                             Characters(including symbols and spaces)</p>
+                                     </div>-->
+
+                                    <div class="col-sm-2">
+                                        <div class="input-group">
+                                            <div class="input-group-addon">+</div>
+                                            <input class="form-control" required type="text"
+                                                   ng-model="partner.contact_phone_c"
+                                                   name="contact_phone_c" id="contact-phone-c-input"
+                                                   maxlength="3" minlength="1"
+                                                   placeholder="country code">
+                                        </div>
+
+                                        <div ng-messages="partnerForm.contact_phone_c.$error"
+                                             ng-if="partnerForm.contact_phone_c.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 20 Characters</p>
+                                        </div>
+                                    </div>
+                                    <div class="col-sm-2">
+                                        <input class="form-control" type="text"
+                                               ng-model="partner.contact_phone_a"
+                                               title="eg:3,当为手机号、服务电话时，可以不填"
+                                               name="contact_phone_a" id="contact-phone-a-input"
+                                               maxlength="2" placeholder="area code">
+                                        <div ng-messages="partnerForm.contact_phone_a.$error"
+                                             ng-if="partnerForm.contact_phone_a.$dirty">
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 2 Characters</p>
+                                        </div>
+                                    </div>
+                                    <div class="col-sm-4">
+                                        <input class="form-control" required type="text"
+                                               ng-model="partner.contact_phone_p"
+                                               name="contact_phone_p" id="contact-phone-p-input"
+                                               maxlength="11" placeholder="phone number">
+                                        <div ng-messages="partnerForm.contact_phone_p.$error"
+                                             ng-if="partnerForm.contact_phone_p.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 11 Characters</p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group"
+                                     ng-class="{'has-error':partnerForm.contact_email.$invalid && partnerForm.contact_email.$dirty}">
+                                    <label class="control-label col-sm-2" for="contact-email-id">*
+                                        E-mail</label>
+                                    <div class="col-sm-8">
+                                        <input class="form-control" ng-model="partner.contact_email"
+                                               required
+                                               name="contact_email" id="contact-email-id"
+                                               maxlength="50">
+                                    </div>
+                                    <div ng-messages="partnerForm.contact_email.$error"
+                                         ng-if="partnerForm.contact_email.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Less Than 50
+                                            Characters(including symbols and spaces)</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <!--end 商户联系资料-->
+                    <div class="panel panel-default">
+                        <div class="panel-heading">Address Information</div>
+                        <div class="panel-body">
+                            <div class="form-horizontal">
+                                <div class="form-group col-sm-6"
+                                     ng-class="{'has-error':partnerForm.address.$invalid && partnerForm.address.$dirty}">
+                                    <label class="control-label col-sm-4" for="address-input">*
+                                        Address</label>
+                                    <div class="col-sm-8">
+                                <textarea class="form-control" ng-model="partner.address"
+                                          name="address"
+                                          id="address-input" maxlength="200" required></textarea>
+                                        <div ng-messages="partnerForm.address.$error"
+                                             ng-if="partnerForm.address.$dirty">
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 200
+                                                Characters(including symbols and spaces)</p>
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group col-sm-6"
+                                     ng-class="{'has-error':partnerForm.suburb.$invalid && partnerForm.suburb.$dirty}">
+                                    <label class="control-label col-sm-4" for="suburb-input">*
+                                        Suburb</label>
+                                    <div class="col-sm-8">
+                                        <input class="form-control" ng-model="partner.suburb"
+                                               name="suburb"
+                                               id="suburb-input" maxlength="50" required>
+                                        <div ng-messages="partnerForm.suburb.$error"
+                                             ng-if="partnerForm.suburb.$dirty">
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 50
+                                                Characters(including symbols and spaces)</p>
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+                                        <!--</div>-->
+                                        <!--<select class="form-control" name="suburb" required ng-model="partner.suburb"-->
+                                        <!--id="suburb-input"-->
+                                        <!--ng-options="t2c.key as t2c.value for t2c in t2city_map">-->
+                                        <!--<option value="">Please Choose</option>-->
+                                        <!--</select>-->
+                                        <!--<div ng-messages="partnerForm.suburb.$error" ng-if="partnerForm.suburb.$dirty">-->
+                                        <!--<p class="small text-danger" ng-message="required">Required Field</p>-->
+                                        <!--</div>-->
+                                    </div>
+                                </div>
+                                <div class="form-group col-sm-6"
+                                     ng-class="{'has-error':partnerForm.postcode.$invalid && partnerForm.postcode.$dirty}">
+                                    <label class="control-label col-sm-4" for="postcode-input">*
+                                        PostCode</label>
+                                    <div class="col-sm-8">
+                                        <input class="form-control" ng-model="partner.postcode"
+                                               name="postcode"
+                                               id="postcode-input" maxlength="10" required>
+                                        <div ng-messages="partnerForm.postcode.$error"
+                                             ng-if="partnerForm.postcode.$dirty">
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 10
+                                                Characters(including symbols and spaces)</p>
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group col-sm-6"
+                                     ng-class="{'has-error':partnerForm.state.$invalid && partnerForm.state.$dirty}">
+                                    <label class="control-label col-sm-4" for="state-input">*
+                                        State</label>
+                                    <div class="col-sm-8">
+                                        <!--<input class="form-control" ng-model="partner.state" name="state" id="state-input"-->
+                                        <!--maxlength="20">-->
+                                        <!--<div ng-messages="partnerForm.state.$error" ng-if="partnerForm.state.$dirty">-->
+                                        <!--<p class="small text-danger" ng-message="maxlength">Less Than 20-->
+                                        <!--Characters(including symbols and spaces)</p>-->
+                                        <!--</div>-->
+                                        <select class="form-control" name="state" required
+                                                ng-model="partner.state"
+                                                id="state-input"
+                                                ng-options="state.value as state.label for state in states">
+                                            <option value="">Please Choose</option>
+                                        </select>
+                                        <div ng-messages="partnerForm.state.$error"
+                                             ng-if="partnerForm.state.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+
+                                    </div>
+                                </div>
+                                <div class="form-group col-sm-6"
+                                     ng-class="{'has-error':partnerForm.country.$invalid && partnerForm.country.$dirty}">
+                                    <label class="control-label col-sm-4" for="country-input">*
+                                        Country</label>
+                                    <div class="col-sm-8">
+                                        <input class="form-control"
+                                               ng-init="partner.country=partner.country||'AUS'"
+                                               ng-model="partner.country" name="country"
+                                               id="country-input" maxlength="20" required
+                                               placeholder="AUS" readonly="readonly">
+                                        <div ng-messages="partnerForm.country.$error"
+                                             ng-if="partnerForm.country.$dirty">
+                                            <p class="small text-danger" ng-message="maxlength">Less
+                                                Than 20
+                                                Characters(including symbols and spaces)</p>
+                                            <p class="small text-danger" ng-message="required">Required
+                                                Field</p>
+                                        </div>
+                                        <!--选择框-->
+                                        <!--<select class="form-control" name="country" required ng-model="partner.country"-->
+                                        <!--id="country-input"-->
+                                        <!--ng-options="country.value as country.label for country in countries">-->
+                                        <!--<option value="">Please Choose</option>-->
+                                        <!--</select>-->
+                                        <!--<div ng-messages="partnerForm.country.$error" ng-if="partnerForm.country.$dirty">-->
+                                        <!--<p class="small text-danger" ng-message="required">Required Field</p>-->
+                                        <!--</div>-->
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-2"
+                                           for="tz-select">TimeZone</label>
+                                    <div class="col-sm-9">
+                                        <select class="form-control" name="timezone"
+                                                ng-model="partner.timezone"
+                                                id="tz-select"
+                                                ng-options="tz.key as tz.detail for tz in timezones">
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="panel panel-default">
+                        <div class="panel-heading" style="font-size: larger">Location
+                            <span id="editmap" hidden>true</span>
+                            <span id="add_view" hidden>true</span>
+                        </div>
+                        <div class="form-group">
+                            <div class="embed-responsive" style="height: 300px;">
+                                <iframe id="merchant_detail" name="merchant_detail" class="embed-responsive-item"
+                                        src="one_locations.html"></iframe>
+                            </div>
+                        </div>
+                    </div>
+                    <!--<div class="panel panel-info">
+                        <div class="panel-heading">Alipay Parameters</div>
+                        <div class="panel-body form-horizontal">
+                            <div class="form-group col-sm-6"
+                                 ng-class="{'has-error':partnerForm.alipay_category.$invalid && partnerForm.alipay_category.$dirty}">
+                                <label class="control-label col-sm-4"
+                                       for="alipay_category">*Category</label>
+                                <div class="col-sm-8" >
+                                    <input class="form-control" id="alipay_category" required
+                                           name="alipay_category" readonly
+                                           ng-model="partner.alipay_category"
+                                           multi-level-select-popup="alipayMccCategory"
+                                           on-select="onAlipayMccSelect($selected)">
+                                    <div ng-messages="partnerForm.alipay_category.$error"
+                                         ng-if="partnerForm.alipay_category.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+
+                    <div class="panel panel-info">
+                        <div class="panel-heading" style="background:#62b900">wechat Parameters</div>
+                        <div class="panel-body form-horizontal">
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.industry.$invalid && partnerForm.industry.$dirty}">
+                                <label class="control-label col-sm-2" for="industry-input">
+                                    *Industry</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="industry"
+                                            ng-model="partner.industry"
+                                            id="industry-input" required
+                                            ng-options="industry.value as industry.label for industry in industries">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="partnerForm.industry.$error"
+                                         ng-if="partnerForm.industry.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+
+                    <div class="panel panel-info">
+                        <div class="panel-heading" style="background:#d82d2d">JD Parameters</div>
+                        <div class="panel-body form-horizontal">
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.jdindustry.$invalid && partnerForm.jdindustry.$dirty}">
+                                <label class="control-label col-sm-2" for="jdindustry-input">
+                                    *Industry</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="jdindustry"
+                                            ng-model="partner.jdindustry"
+                                            id="jdindustry-input" required
+                                            ng-options="industry.value as industry.label for industry in jdindustry">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="partnerForm.jdindustry.$error"
+                                         ng-if="partnerForm.jdindustry.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="panel panel-info">
+                        <div class="panel-heading" style="background:#f06010;color: #f6f6f6;">RoyalPay Parameters</div>
+                        <div class="panel-body form-horizontal">
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.royalpayindustry.$invalid && partnerForm.royalpayindustry.$dirty}">
+                                <label class="control-label col-sm-2" for="royalpayindustry-input">
+                                    *Industry</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="royalpayindustry"
+                                            ng-model="partner.royalpayindustry"
+                                            id="royalpayindustry-input" required
+                                            ng-options="industry.value as industry.label for industry in royalpayindustry">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="partnerForm.royalpayindustry.$error"
+                                         ng-if="partnerForm.royalpayindustry.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>-->
+
+
+                    <div class="panel panel-default">
+                        <div class="panel-heading" style="color: #333;background-color: #f5f5f5;border-color: #ddd;">
+                            Industry
+                        </div>
+                        <div class="panel-body form-horizontal">
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.royalpay_label.$invalid && partnerForm.royalpay_label.$dirty}">
+                                <label class="control-label col-sm-2"
+                                       for="royalpayindustry">*RoyalPay Industry</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" id="royalpayindustry" required
+                                           name="royalpayindustry" readonly
+                                           ng-model="partner.royalpayindustry|partner_royalpay_industry"
+                                           multi-level-select-popup="royalpayindustry"
+                                           on-select="onRoyalPayIndustrySelect($selected)">
+                                    <div ng-messages="partnerForm.royalpay_label.$error"
+                                         ng-if="partnerForm.royalpay_label.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.jdindustry.$invalid && partnerForm.jdindustry.$dirty}">
+                                <label class="control-label col-sm-2" for="jdindustry-input">
+                                    *JDPay Industry</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="jdindustry"
+                                            ng-model="partner.jdindustry"
+                                            id="jdindustry-input" required
+                                            ng-options="industry.value as industry.label for industry in jdindustry">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="partnerForm.jdindustryindustry.$error"
+                                         ng-if="partnerForm.jdindustryindustry.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
+                                </div>
+                            </div>
+
+
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.industry.$invalid && partnerForm.industry.$dirty}">
+                                <label class="control-label col-sm-2" for="industry-input">
+                                    *Wechat Industry</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="industry"
+                                            ng-model="partner.industry"
+                                            id="industry-input" required
+                                            ng-options="industry.value as industry.label for industry in industries">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="partnerForm.industry.$error"
+                                         ng-if="partnerForm.industry.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group"
+                                 ng-class="{'has-error':partnerForm.alipay_category.$invalid && partnerForm.alipay_category.$dirty}">
+                                <label class="control-label col-sm-2"
+                                       for="alipay_category">*Alipay Category</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" id="alipay_category" required
+                                           name="alipay_category" readonly
+                                           ng-model="partner.alipayindustry|partner_alipay_industry"
+                                           multi-level-select-popup="alipayMccCategory"
+                                           on-select="onAlipayMccSelect($selected)">
+                                    <div ng-messages="partnerForm.alipay_category.$error"
+                                         ng-if="partnerForm.alipay_category.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required
+                                            Field</p>
+                                    </div>
+                                </div>
+
+                            </div>
+
+                            <div class="form-group" ng-if="('10'|withRole) || ('1'|withRole)">
+                                <label class="control-label col-sm-2"
+                                       for="hf_category">HF Industry</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" id="hf_category" required
+                                           name="hf_label" readonly
+                                           ng-model="partner.hfindustry|partner_hf_industry"
+                                           multi-level-select-popup="hfindustry"
+                                           on-select="onHfIndustrySelect($selected)">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
                 <div class="panel panel-default">
                     <div class="panel-heading">Alipay Information &nbsp; <em class="small"><b>(Optional)</b></em></div>
                     <div class="panel-body">

From f80f532c018cb74af83c353a476142621dc70c11 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 26 Mar 2019 15:29:53 +0800
Subject: [PATCH 21/38] fix

---
 .../core/impls/ManageAppServiceImp.java       |  2 --
 .../templates/app/bd_prize_rules.html         |  7 +++---
 .../bdprize/templates/bd_prize_root.html      | 22 +++++++++----------
 .../templates/client_partner_detail.html      | 21 ++++++++++++++++++
 4 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index 2d9c56cf0..4ed05b032 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -363,7 +363,6 @@ public class ManageAppServiceImp implements ManageAppService {
 
     @Override
     public List<JSONObject>  getBdPrizeList(JSONObject device) {
-        //todo 获取BD提成列表
         String clientType = device.getString("client_type");
         manageDeviceSupport.findRegister(clientType);
         JSONObject manager = managerMapper.findById(device.getString("manager_id"));
@@ -376,7 +375,6 @@ public class ManageAppServiceImp implements ManageAppService {
 
     @Override
     public String getPrizeRulesUrl(JSONObject device) {
-        //todo 获取BD提成列表
         String clientType = device.getString("client_type");
         manageDeviceSupport.findRegister(clientType);
         JSONObject manager = managerMapper.findById(device.getString("manager_id"));
diff --git a/src/main/resources/templates/app/bd_prize_rules.html b/src/main/resources/templates/app/bd_prize_rules.html
index 31e8d1270..7885015b4 100755
--- a/src/main/resources/templates/app/bd_prize_rules.html
+++ b/src/main/resources/templates/app/bd_prize_rules.html
@@ -41,7 +41,6 @@
 </style>
 <body ng-app="bdRulesApp" ng-controller="bdRulesCtrl">
 <div class="box box-info">
-    <div class="box-header">提成规则</div>
     <div class="box-body">
         <h4>BD分级提成费率速查表</h4>
         <div class="table-responsive">
@@ -79,9 +78,9 @@
         <h4>补充说明</h4>
         <ul>
             <li>按月度发放</li>
-            <li>每月发放总提成额度的 80%，剩余 20%按照“年度考评分数比例”于每年年底即 12 月 25 日圣诞前发放</li>
-            <li>提前离职者，20%提成不予发放</li>
-            <li>年度考评（根据销管中心每月考评表打分制进行统计）按照考评分数对应比例发放 20%的占比部分，扣下部分如果第二年考评超出一定评分 110%可以补发；同样，如果年度考评分数超过 100 分按照同比例发放</li>
+            <li>每月发放总提成额度的60%，剩余40%按照“年度考评分数比例”于每年年底即12 月25 日圣诞前发放</li>
+            <li>提前离职者，40%提成不予发放</li>
+            <li>年度考评（根据销管中心每月考评表打分制进行统计）按照考评分数对应比例发放40%的占比部分，扣下部分如果第二年考评超出一定评分110%可以补发；同样，如果年度考评分数超过100 分按照同比例发放</li>
             <li>商户开通后连续 1 个月未产生流水的，上交主管，由主管重新分配</li>
             <li>连续 2 个月不产生流水的商户，由销管部统一收回，重新分配</li>
             <li>分配后的商户流水客户专员只能占一半</li>
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
index 9603ee070..dc4b7f769 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html
@@ -12,14 +12,14 @@
                 <div class="box box-default">
                     <div class="box-body">
                         <div class="form-inline">
-                            <div class="form-group">
-                                <input type="text" class="form-control" uib-datepicker-popup="yyyy-MM" ng-model="generate.month"
-                                       is-open="ctrl.genmonth" datepicker-options="{minMode: 'month'}"
-                                       ng-click="ctrl.genmonth=true" placeholder="Select Month"/>
-                            </div>
-                            <button class="btn btn-primary" ng-click="generateReport()" ng-disabled="!generate.month">
-                                Generate Report
-                            </button>
+                            <!--<div class="form-group">-->
+                                <!--<input type="text" class="form-control" uib-datepicker-popup="yyyy-MM" ng-model="generate.month"-->
+                                       <!--is-open="ctrl.genmonth" datepicker-options="{minMode: 'month'}"-->
+                                       <!--ng-click="ctrl.genmonth=true" placeholder="Select Month"/>-->
+                            <!--</div>-->
+                            <!--<button class="btn btn-primary" ng-click="generateReport()" ng-disabled="!generate.month">-->
+                                <!--Generate Report-->
+                            <!--</button>-->
                             <button class="btn btn-primary" ng-click="editRateConfig()"><i class="fa fa-cog"></i> Edit Rate Config</button>
                             <button class="btn btn-primary" ng-click="editBDLevels()"><i class="fa fa-user"></i> Edit BD Level</button>
                             <loadingbar ng-if="generate.status"></loadingbar>
@@ -153,9 +153,9 @@
                 <h4>补充说明</h4>
                 <ul>
                     <li>按月度发放</li>
-                    <li>每月发放总提成额度的 80%，剩余 20%按照“年度考评分数比例”于每年年底即 12 月 25 日圣诞前发放</li>
-                    <li>提前离职者，20%提成不予发放</li>
-                    <li>年度考评（根据销管中心每月考评表打分制进行统计）按照考评分数对应比例发放 20%的占比部分，扣下部分如果第二年考评超出一定评分 110%可以补发；同样，如果年度考评分数超过 100 分按照同比例发放</li>
+                    <li>每月发放总提成额度的60%，剩余40%按照“年度考评分数比例”于每年年底即12 月25 日圣诞前发放</li>
+                    <li>提前离职者，40%提成不予发放</li>
+                    <li>年度考评（根据销管中心每月考评表打分制进行统计）按照考评分数对应比例发放40%的占比部分，扣下部分如果第二年考评超出一定评分110%可以补发；同样，如果年度考评分数超过100 分按照同比例发放</li>
                     <li>商户开通后连续 1 个月未产生流水的，上交主管，由主管重新分配</li>
                     <li>连续 2 个月不产生流水的商户，由销管部统一收回，重新分配</li>
                     <li>分配后的商户流水客户专员只能占一半</li>
diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html
index 315dd19b2..0e1ccad1a 100644
--- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html
@@ -176,6 +176,27 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="panel panel-default">
+                            <div class="panel-heading">Merchant Payment Scenario</div>
+                            <div class="panel-body">
+                                <div class="form-horizontal">
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-2">
+                                            Merchant Payment Scenario Type</label>
+                                        <div class="col-sm-8">
+                                            <p class="form-control-static"
+                                               ng-bind="partner.client_pay_type">
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-2">Merchant Payment Scenario Description</label>
+                                        <div class="col-sm-10">
+                                            <p class="form-control-static" ng-bind="partner.client_pay_desc"></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                         <div class="panel panel-default">
                             <div class="panel-heading">Alipay Information &nbsp; <em class="small"><b>(Optional)</b></em></div>
                             <div class="panel-body">

From a9b363fddfc9e975474722a8a914a2faee579f40 Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Tue, 26 Mar 2019 17:07:21 +0800
Subject: [PATCH 22/38] =?UTF-8?q?Inspiry=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  4 ++
 .../mappers/system/ClientDeviceMapper.java    |  5 +-
 .../manage/merchants/core/ClientManager.java  |  1 +
 .../core/impls/ClientManagerImpl.java         | 29 +++++++++-
 .../web/PartnerManageController.java          |  8 +++
 .../static/payment/partner/partner-manage.js  | 53 ++++++++++++++++-
 src/main/ui/static/payment/partner/partner.js | 16 +++++-
 .../payment/partner/templates/add_device.html | 57 +++++++++++++++++++
 .../partner/templates/partner_devices.html    |  5 +-
 9 files changed, 168 insertions(+), 10 deletions(-)
 create mode 100644 src/main/ui/static/payment/partner/templates/add_device.html

diff --git a/pom.xml b/pom.xml
index b775c503d..5b0475543 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,10 @@
             <artifactId>jpinyin</artifactId>
             <version>1.1.7</version>
         </dependency>
+        <dependency>
+            <groupId>com.globalfreepay.payment</groupId>
+            <artifactId>payment-core</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>au.com.royalpay.payment</groupId>
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.java
index 401a3a36c..80f9f8225 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.java
@@ -28,7 +28,10 @@ public interface ClientDeviceMapper {
 
     @AutoSql(type = SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "is_valid=1")
-    JSONObject findByClientDevId(@Param("client_dev_id") String clientDevId, @Param("client_type") String clientType);
+    JSONObject findByClientDevIdAndClientType(@Param("client_dev_id") String clientDevId, @Param("client_type") String clientType);
+
+    @AutoSql(type = SqlType.SELECT)
+    JSONObject findByClientDevId(@Param("client_dev_id") String clientDevId);
 
     PageList<JSONObject> listClientDevices(JSONObject params, PageBounds pagination);
 
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 4e8151f6b..40177c321 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
@@ -407,4 +407,5 @@ public interface ClientManager {
 
     void partnerCBChannelConfig(String clientMoniker, String channelKey, String channel_id);
 
+    void addDevice(JSONObject manager, String clientMoniker, JSONObject device);
 }
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 202a7b2bc..187ff26dd 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
@@ -2072,6 +2072,30 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         return PageListUtils.buildPageListResult(devices);
     }
 
+    @Override
+    public void addDevice(JSONObject manager, String clientMoniker,JSONObject device) {
+        JSONObject client = getClientInfoByMoniker(clientMoniker);
+        if (client == null) {
+            throw new InvalidShortIdException();
+        }
+        checkOrgPermission(manager, client);
+
+        String clientDevId = device.getString("client_dev_id");
+        JSONObject dev = clientDeviceMapper.findByClientDevId(clientDevId);
+        if(dev == null){
+            throw new NotFoundException("设备不存在");
+        }
+        if (dev.getIntValue("client_id") != client.getIntValue("client_id")) {
+            if(dev.getIntValue("is_valid") == 1){
+                throw new BadRequestException("其他商户正在使用");
+            }
+        }
+        device.put("dev_id",dev.getString("dev_id"));
+        device.put("client_id",client.getIntValue("client_id"));
+        device.put("remark",dev.getString("remark"));
+        clientDeviceMapper.update(device);
+    }
+
     @Override
     public void updateDevie(JSONObject manager, String clientMoniker, String devId, String remark) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);
@@ -3812,8 +3836,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
 
         AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayRetailMerchant();
-        //Element resultElement = alipayClient.registerGmsPortal(mch.getPid(), client);
-        Element resultElement = null;
+        Element resultElement = alipayClient.registerGmsPortal(mch.getPid(), client);
         if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {
             throw new BadRequestException(resultElement.elementText("error"));
         }
@@ -4027,7 +4050,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         yeepayConfig.put("industry",merchantInfo.getString("industry"));
         yeepayConfig.put("business_content",merchantInfo.getString("business_content"));
         yeepayConfig.put("business_licence",merchantInfo.getString("business_licence"));
-        //yeePayClientConfigMapper.update(yeepayConfig);
+        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"));
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
index 14065bb90..97487d462 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
@@ -446,6 +446,7 @@ public class PartnerManageController {
         clientManager.registerClient(clientMoniker, registery, manager);
     }
 
+    //商户设备管理 获取商户设备信息
     @ManagerMapping(value = "/{clientMoniker}/devices", method = RequestMethod.GET, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.BD_USER, ManagerRole.DIRECTOR})
     public JSONObject listClientDevices(@PathVariable String clientMoniker, @RequestParam(required = false) String remark, @RequestParam(required = false) String client_type,
                                         @RequestParam(required = false) String[] client_ids,
@@ -454,6 +455,13 @@ public class PartnerManageController {
         return clientManager.listClientDevices(manager, clientMoniker, remark, page, limit,client_type,client_ids);
     }
 
+    //给商户新增设备
+    @ManagerMapping(value = "/{clientMoniker}/addDevices", method = RequestMethod.POST, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.BD_USER})
+    public void addDevice(@PathVariable String clientMoniker, @RequestBody JSONObject device,
+                             @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+        clientManager.addDevice(manager, clientMoniker,device);
+    }
+
     @ManagerMapping(value = "/{clientMoniker}/devices/{devId}", method = RequestMethod.PUT, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.BD_USER})
     public void modifyDevice(@PathVariable String clientMoniker, @PathVariable String devId, @RequestBody JSONObject remark,
                              @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index b4fd7c576..99d039abb 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -2818,8 +2818,13 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             })
         }
     }]);
-    app.controller('partnerDeviceCtrl', ['$scope', '$http', 'orderService', 'commonDialog', 'refunder', function ($scope, $http, orderService, commonDialog, refunder) {
-        $scope.pagination = {};
+    app.controller('partnerDeviceCtrl', ['$scope', '$http', 'orderService', 'commonDialog', 'refunder','$uibModal', function ($scope,$http, orderService, commonDialog, refunder,$uibModal) {
+
+            $scope.pagination = {};
+        /**
+         * 查看设备
+         * @param page
+         */
         $scope.listDevices = function (page) {
             var params = angular.copy($scope.devsearch) || {};
             params.page = page || $scope.pagination.page || 1;
@@ -2829,6 +2834,24 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             })
         };
         $scope.listDevices(1);
+
+        /**
+         * 添加设备
+         */
+        $scope.addDevices = function () {
+            $uibModal.open({
+                templateUrl: '/static/payment/partner/templates/add_device.html',
+                controller: 'newDeviceDialogCtrl',
+                resolve: {
+                    clientMoniker: function () {
+                        return $scope.partner.client_moniker;
+                    }
+                }
+            }).result.then(function () {
+                $scope.listDevices();
+            })
+        };
+
         $scope.showDeviceOrders = function (dev) {
             $scope.params.dev_id = dev.dev_id;
             $scope.listOrders(1);
@@ -2964,6 +2987,32 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             }
         }
     }]);
+
+    app.controller('newDeviceDialogCtrl', ['$scope', '$http', 'clientMoniker', function ($scope, $http,clientMoniker) {
+        $scope.params = {};
+        $scope.manager = {};
+
+        $scope.save = function (form) {
+            $scope.errmsg = null;
+            if (form.$invalid) {
+                angular.forEach(form, function (item, key) {
+                    if (key.indexOf('$') < 0) {
+                        item.$dirty = true;
+                    }
+                });
+                return;
+            }
+
+            $http.post('/sys/partners/' + clientMoniker + '/addDevices', $scope.device).then(function () {
+                $scope.$close();
+            }, function (resp) {
+                $scope.errmsg = resp.data.message;
+            })
+        };
+
+    }]);
+
+
     app.controller('partnerChooseBDUserDialogCtrl', ['$scope', '$http', '$filter', 'partner', 'bdUsers', 'type', function ($scope, $http, $filter, partner, bdUsers, type) {
         $scope.bdUsers = bdUsers.data;
         $scope.data = {};
diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js
index 2ab7c022a..dfcf180fb 100644
--- a/src/main/ui/static/payment/partner/partner.js
+++ b/src/main/ui/static/payment/partner/partner.js
@@ -2,9 +2,9 @@
  * partner info in partner client
  * Created by yixian on 2016-07-03.
  */
-define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], function (angular, Decimal) {
+define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload','uiBootstrap'], function (angular, Decimal) {
     'use strict';
-    var app = angular.module('partnerInfoApp', ['ui.router', 'frapontillo.bootstrap-switch', 'ngFileUpload']);
+    var app = angular.module('partnerInfoApp', ['ui.router', 'frapontillo.bootstrap-switch', 'ngFileUpload','ui.bootstrap']);
     app.config(['$stateProvider', function ($stateProvider) {
         $stateProvider.state('basic', {
             url: '/basic',
@@ -969,9 +969,13 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
         };
         $scope.loadSubPartners();
     }]);
-    app.controller('clientDeviceCtrl', ['$scope', '$http', 'orderService', 'commonDialog', 'refunder','$filter', function ($scope, $http, orderService, commonDialog, refunder,$filter) {
+    app.controller('clientDeviceCtrl','newDive','newDeviceDialogCtrl', ['$scope', '$http', 'orderService', 'commonDialog', 'refunder','$filter', '$uibModal',  function ($scope, $http, orderService, commonDialog, refunder,$filter,$uibModal) {
         $scope.pagination = {};
         $scope.params = {};
+        /**
+         * 查询设备
+         * @param page
+         */
         $scope.listDevices = function (page) {
             var params = angular.copy($scope.devsearch) || {};
             params.page = page || $scope.pagination.page || 1;
@@ -981,6 +985,8 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
             })
         };
         $scope.listDevices(1);
+
+
         $scope.showDeviceOrders = function (dev) {
             $scope.params.dev_id = dev.dev_id;
             $scope.listOrders(1);
@@ -1067,6 +1073,10 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
         $scope.refundOrder = function (order) {
             refunder.refunded(order.order_id)
         };
+
+
+
+
     }]);
     return app;
 });
diff --git a/src/main/ui/static/payment/partner/templates/add_device.html b/src/main/ui/static/payment/partner/templates/add_device.html
new file mode 100644
index 000000000..a86ab0240
--- /dev/null
+++ b/src/main/ui/static/payment/partner/templates/add_device.html
@@ -0,0 +1,57 @@
+<div class="modal-header">
+    <h4>New Manager Device</h4>
+</div>
+<div class="modal-body">
+    <div class="row">
+        <div class="col-sm-12">
+            <form novalidate name="accountForm">
+                <div class="form-group"
+                     ng-class="{'has-error':accountForm.client_dev_id.$invalid && accountForm.client_dev_id.$dirty}">
+                    <label class="control-label" for="client_dev_id-input">* 设备编号</label>
+                    <input required class="form-control text-lowercase" id="client_dev_id-input" name="client_dev_id"
+                           ng-model="device.client_dev_id" maxlength="50">
+                    <div ng-messages="accountForm.client_dev_id.$error" ng-if="accountForm.client_dev_id.$dirty">
+                        <p class="small text-danger" ng-message="required">client_dev_id field is required</p>
+                    </div>
+                </div>
+                <div class="form-group"
+                     ng-class="{'has-error':accountForm.auth_code.$invalid && accountForm.auth_code.$dirty}">
+                    <label class="control-label" for="auth_code-input">* 设备密钥</label>
+                    <input required class="form-control" id="auth_code-input" name="auth_code"
+                           ng-model="device.auth_code" maxlength="50">
+                    <div ng-messages="accountForm.auth_code.$error" ng-if="accountForm.auth_code.$dirty">
+                        <p class="small text-danger" ng-message="required">设备密钥 field is required</p>
+                    </div>
+                </div>
+                <div class="form-group"
+                     ng-class="{'has-error':accountForm.client_type.$invalid && accountForm.client_type.$dirty}">
+                    <label class="control-label" for="client_type-input">* 设备类型</label>
+                    <input required class="form-control" id="client_type-input" name="client_type"
+                           ng-model="device.client_type">
+                    <div ng-messages="accountForm.auth_code.$error" ng-if="accountForm.auth_code.$dirty">
+                        <p class="small text-danger" ng-message="required">设备类型 field is required</p>
+                    </div>
+                </div>
+
+                <div class="form-group"
+                     ng-class="{'has-error':accountForm.version.$invalid && accountForm.version.$dirty}">
+                    <label class="control-label" for="version-input">* version</label>
+                    <input required class="form-control" id="version-input" name="version"
+                           ng-model="device.version">
+                    <div ng-messages="accountForm.auth_code.$error" ng-if="accountForm.auth_code.$dirty">
+                        <p class="small text-danger" ng-message="required">version field is required</p>
+                    </div>
+                </div>
+
+            </form>
+        </div>
+    </div>
+</div>
+<div class="modal-footer">
+    <div class="btn-group">
+        <button class="btn btn-success" type="button" ng-click="save(accountForm)">Submit</button>
+    </div>
+    <div class="btn-group">
+        <button class="btn btn-danger" type="button" ng-click="$dismiss()">Cancel</button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/main/ui/static/payment/partner/templates/partner_devices.html b/src/main/ui/static/payment/partner/templates/partner_devices.html
index 5f9a774a9..fc28c9ce9 100644
--- a/src/main/ui/static/payment/partner/templates/partner_devices.html
+++ b/src/main/ui/static/payment/partner/templates/partner_devices.html
@@ -3,11 +3,14 @@
         <div class="list-group">
             <div class="list-group-item">
                 <div class="input-group">
-                    <input class="form-control" placeholder="Keywords" ng-model="devsearch.remark">
+                    <input class="form-control" placeholder="Keywords" ng-model="devsearch.remark" >
                     <div class="input-group-btn">
                         <button class="btn btn-success" ng-click="listDevices()">
                             <i class="fa fa-search"></i>
                         </button>
+                        <button class="btn btn-primary" ng-click="addDevices()">
+                            <i class="fa fa-plus"></i> addDevice
+                        </button>
                     </div>
                 </div>
             </div>

From dc87e9b82e5182b7bce9d0ef685f08ef613475c3 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 27 Mar 2019 14:42:57 +0800
Subject: [PATCH 23/38] =?UTF-8?q?add=20=E9=A3=8E=E6=8E=A7=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E4=BA=8B=E4=BB=B6=E5=A2=9E=E5=8A=A0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impl/RiskBusinessServiceImpl.java    |  54 +++++
 .../templates/mail/risk_upload_mail.html      |  11 +-
 src/main/ui/static/analysis/risk_business.js  | 189 ++++++++++++------
 .../analysis/templates/new_riskEvent.html     |  26 +++
 .../analysis/templates/riskEvent_detail.html  |  36 ++++
 5 files changed, 248 insertions(+), 68 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 c1f94f227..49aae675f 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
@@ -787,6 +787,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         ctx.setVariable("warning_order_type", event.getIntValue("warning_order_type"));
         ctx.setVariable("description", event.getString("description"));
         ctx.setVariable("is_send_client",event.getIntValue("is_send_client"));
+        ctx.setVariable("mail_template",event.get("mail_template")==null?0:event.getIntValue("mail_template"));
         String realOrderIdsStr = event.getString("real_order_ids");
         String[] realOrderIds = {};
         if (StringUtils.isNotBlank(realOrderIdsStr)) {
@@ -1202,6 +1203,21 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
                             "Other pictures"
             );
         }
+        if (riskEvent.get("mail_template") != null) {
+            switch (riskEvent.getIntValue("mail_template")) {
+                case 1:
+                    materialsRemark = getShopTemplate();
+                    break;
+                case 2:
+                    materialsRemark = getTicketTemplate();
+                    break;
+                case 3:
+                    materialsRemark = getStudyTemplate();
+                    break;
+                default:
+                    break;
+            }
+        }
 
         JSONObject material = getRiskMaterial(riskEvent);
         for (int i = 0; i < materialsRemark.size(); i++) {
@@ -1279,4 +1295,42 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
             }
         }
     }
+
+    private List<String> getShopTemplate() {
+        return Arrays.asList("1.与调查交易金额对应的购物小票/发票存根照片 要求：照片应清晰，必须显示商户名称、商户地址、购物时间、物品名称、购物金额等；\n" +
+                        "Photos of shopping receipts/ invoice stubs Requirement corresponding with the investigated orders Requirement: The photos should be clear and must show Merchant name, Business address, Transaction time, Product information, Quantity purchased, etc;",
+                "2.购买物品如邮寄至国内，需提供物流公司发货单据，并提供对应物流公司的查询网址；澳洲本地销售则不需要提供物流单据 要求：每笔交易对应的物流单必须提供，且单据必须清晰可见；\n" +
+                        "Photos of logistics companies’goods-delivery documents if trading across borders with Logistics company inquiry website for verifying; no need for local sales Requirement: The logistics order record corresponding to each transaction must be provided, and details of records should be clearly visible;",
+                "3.线上用户购买虚拟物品需要提供聊天记录、订单信息、发货凭证截图、 虚拟物品最终消费场景（例如何种游戏、软件）、提供消费场景网址/下载链接（公司官网、公众号等） 要求：每笔交易对应的截图必须清晰可见；\n" +
+                        "Users need to provide chat records, order information, screenshots of delivery documents, final consumption scenarios of virtual goods (such as games, software); provide consumer scene URL / download link(official website/official accounts/other official platforms). Requirement: The screenshot corresponding to each transaction must be clearly visible;",
+                "4.商户线下门店提供显示商户门牌号码和店头名称的照片；显示商户营业场景所场内部情况（如店内商品陈列、收银台等）的照片 要求：照片清晰，外景至少一张，内景能清楚显示商户实际售卖物品或服务，至少三张Photos of Merchant Street number & Merchant name；\n" +
+                        "Photos of internal environment of merchant business (such as in-store merchandise display, checkout counter, etc.) Requirements: At least one visible photo of store location; The photos (at least three) showing merchant activities including actual selling-goods or services obviously;",
+                "5.其它补充材料包含调单任务描述中要求提供的商户后台入驻材料等；商户的经营业务模式说明：介绍售卖的主要物品种类或是提供的服务内容、客单价均值、营业时间等）;\n" +
+                        "Other materials including onboarding materials as task description required；Explanation of business model for your merchant including actual selling-goods or services, per customer transaction, business hours, etc;"
+        );
+    }
+
+    private List<String> getTicketTemplate() {
+        return Arrays.asList("1.与调查交易金额对应的购物小票/发票存根照片 要求：照片应清晰，必须显示商户名称、商户地址、购物时间、物品名称、购物金额等；\n" +
+                        "Photos of shopping receipts/ invoice stubs Requirement corresponding with the investigated orders Requirement: The photos should be clear and must show Merchant name, Business address, Transaction time, Product information, Quantity purchased, etc;",
+                "2.与调查交易相对应的客户旅游行程明细（包含行程单、机票、酒店预订信息等），线上用户购买行程/机票等的聊天记录、订单信息、购买凭证截图、提供消费场景网址/下载链接（公司官网、公众号等） 要求：每笔交易对应的截图必须清晰可见；\n" +
+                        "Users need to provide travel itinerary, hotel reservation Information and journey times of customers about the orders, provide records of investigated orders, provide consumer scene URL / download link(official website/official accounts/other official platforms). Requirement: The screenshot corresponding to each transaction must be clearly visible;",
+                "3.商户线下门店提供显示商户门牌号码和店头名称的照片（清晰可见，至少一张）；显示商户营业场景所场内部情况（如店内商品陈列、收银台等）的照片（照片清晰，且能清楚显示商户实际售卖物品或服务，至少三张 ）；\n" +
+                        "Photos of Merchant Street number & Merchant name; Photos of internal environment of merchant business (such as in-store merchandise display, checkout counter, etc.) Requirements: At least one visible photo of store location; The photos (at least three) showing merchant activities including actual selling-goods or services obviously;",
+                "4.其它补充材料包含调单任务描述中要求提供的商户后台入驻材料等；商户的经营业务模式说明：介绍售卖的主要物品种类或是提供的服务内容、客单价均值、营业时间等）;\n" +
+                        "Other materials including onboarding materials as task description required；Explanation of business model for your merchant including actual selling-goods or services, per customer transaction, business hours, etc;"
+        );
+    }
+
+    private List<String> getStudyTemplate() {
+        return Arrays.asList("1.与调查交易金额对应的购物小票/发票存根照片 要求：照片应清晰，必须显示商户名称、商户地址、购物时间、物品名称、购物金额等；\n" +
+                        "Photos of shopping receipts/ invoice stubs Requirement corresponding with the investigated orders Requirement: The photos should be clear and must show Merchant name, Business address, Transaction time, Product information, Quantity purchased, etc;",
+                "2.与调查交易相对应的客户支付购买的课程明细、教育服务（签证、咨询等）明细，单价，数量，具体购买服务内容，线上用户购买的聊天记录、购买凭证截图、提供消费场景网址/下载链接（公司官网、公众号等） 要求：每笔交易对应的截图必须清晰可见；\n" +
+                        "Users need to provide the details of purchased courses/education services(visa services/consulting/others) including price, quantity, service details, chat records online, order information, screenshots of system ordered details; provide consumer scene URL / download link(official website/official accounts/other official platforms). Requirement: The screenshot corresponding to each transaction must be clearly visible;",
+                "3.商户线下门店提供显示商户门牌号码和店头名称的照片（清晰可见，至少一张）；显示商户营业场景所场内部情况（如店内商品陈列、收银台等）的照片（照片清晰，且能清楚显示商户实际售卖物品或服务，至少三张 ）；\n" +
+                        "Photos of Merchant Street number & Merchant name; Photos of internal environment of merchant business (such as in-store merchandise display, checkout counter, etc.) Requirements: At least one visible photo of store location; The photos (at least three) showing merchant activities including actual selling-goods or services obviously;",
+                "4.其它补充材料包含调单任务描述中要求提供的商户后台入驻材料等；商户的经营业务模式说明：介绍售卖的主要物品种类或是提供的服务内容、客单价均值、营业时间等）;\n" +
+                        "Other materials including onboarding materials as task description required；Explanation of business model for your merchant including actual selling-goods or services, per customer transaction, business hours, etc;"
+        );
+    }
 }
diff --git a/src/main/resources/templates/mail/risk_upload_mail.html b/src/main/resources/templates/mail/risk_upload_mail.html
index 155293c49..9fb8b01fa 100644
--- a/src/main/resources/templates/mail/risk_upload_mail.html
+++ b/src/main/resources/templates/mail/risk_upload_mail.html
@@ -23,8 +23,15 @@
         before <span style="background: #FCE824;" th:text="${reply_date_english}"></span>(Sydney time).
     </p>
 
-    <p>1、请提供以下被查单号的小票， 物流单据（如有邮寄产品的情况）， 以及消费者与买家的聊天记录等来佐证被查交易单号。 被查交易单号如下:</p>
-    <p>1. Please submit the materials including invoices, courier receipts (if have posted products), and chatting records or scene of consumption which can prove the facticity of the following reviewed orders. The reviewed orders as follows:</p>
+    <p th:if="${mail_template==0}">1、请提供以下被查单号的小票， 物流单据（如有邮寄产品的情况）， 以及消费者与买家的聊天记录等来佐证被查交易单号。 被查交易单号如下:</p>
+    <p th:if="${mail_template==0}">1. Please submit the materials including invoices, courier receipts (if have posted products), and chatting records or scene of consumption which can prove the facticity of the following reviewed orders. The reviewed orders as follows:</p>
+    <p th:if="${mail_template==1}">1、请提供以下被查单号的交易相关发票，对应的物流单据（如有邮寄产品的情况）， 以及体现消费场景的聊天截图等来佐证被查交易单号。 被查交易单号如下:</p>
+    <p th:if="${mail_template==1}">1. Please submit the materials including invoices, courier receipts (if have posted products), and chatting records or scene of consumption which can prove the facticity of the following reviewed orders. The reviewed orders as follows:</p>
+    <p th:if="${mail_template==2}">1、请提供以下被查单号的交易相关票据，对应消费项目的行程单、机票、酒店预定凭证等， 以及体现消费场景的聊天截图等来佐证被查交易单号。 被查交易单号如下:</p>
+    <p th:if="${mail_template==2}">1. Please submit the materials including invoices, courier receipts (if have posted products), and chatting records or scene of consumption which can prove the facticity of the following reviewed orders. The reviewed orders as follows:</p>
+    <p th:if="${mail_template==3}">1、请提供以下被查单号的交易相关票据，详细购买的具体课程、服务、咨询明细， 以及体现消费场景的聊天截图等来佐证被查交易单号。 被查交易单号如下:</p>
+    <p th:if="${mail_template==3}">1. Please submit the materials including invoices, courier receipts (if have posted products), and chatting records or scene of consumption which can prove the facticity of the following reviewed orders. The reviewed orders as follows:</p>
+
     <table style="border: 1.0px solid;border-collapse: collapse;">
         <thead>
         <tr>
diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js
index 1aad32af1..8e3c51f49 100644
--- a/src/main/ui/static/analysis/risk_business.js
+++ b/src/main/ui/static/analysis/risk_business.js
@@ -4,6 +4,14 @@
 define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
     function (angular, $) {
         'use strict';
+
+        var mailTemplate = {
+            "1": "代购、综合商城类",
+            "2": "飞机票、旅行社类",
+            "3": "教育类、中介类"
+        };
+
+
         var orderTypesMap = {
             "1": "微信调单",
             "2": "支付宝调单",
@@ -129,7 +137,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
 
         }]);
 
-        app.controller('riskBusinessCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', 'commonDialog', 'industryMap','chartParser',
+        app.controller('riskBusinessCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', 'commonDialog', 'industryMap', 'chartParser',
             function ($scope, $state, $http, $uibModal, $filter, commonDialog, industryMap, chartParser) {
                 $scope.orderTypes = orderTypesMap;
                 $scope.orderTypesForBD = orderTypesMapForBD;
@@ -165,11 +173,11 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                     });
                     $http.get('/risk/business/events/analysis/industry', {params: params}).then(function (resp) {
                         $scope.riskEventsByIndustry = resp.data;
-                        $scope.risk_industry_chart = chartParser.parse(industryAmount(industries),$scope.riskEventsByIndustry);
+                        $scope.risk_industry_chart = chartParser.parse(industryAmount(industries), $scope.riskEventsByIndustry);
                     });
                     $http.get('/risk/business/events/analysis/amount', {params: params}).then(function (resp) {
                         $scope.riskEventsByAmount = resp.data;
-                        $scope.risk_amount_chart = chartParser.parse(intervalsAmount(),$scope.riskEventsByAmount);
+                        $scope.risk_amount_chart = chartParser.parse(intervalsAmount(), $scope.riskEventsByAmount);
                     });
 
                 };
@@ -193,15 +201,15 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                                 name: '风控事件单量', type: 'pie',
                                 radius: '80%',
                                 center: ['50%', '58%'],
-                                label:{            //饼图图形上的文本标签
-                                    normal:{
-                                        show:true,
-                                        position:'outer', //标签的位置
-                                        textStyle : {
-                                            fontWeight : 300 ,
-                                            fontSize : 16    //文字的字体大小
+                                label: {            //饼图图形上的文本标签
+                                    normal: {
+                                        show: true,
+                                        position: 'outer', //标签的位置
+                                        textStyle: {
+                                            fontWeight: 300,
+                                            fontSize: 16    //文字的字体大小
                                         },
-                                        formatter:'{d}%'
+                                        formatter: '{d}%'
                                     }
                                 },
                                 itemStyle: {
@@ -228,8 +236,8 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                             legend: {
                                 orient: 'vertical',
                                 left: 'right',
-                                data: [ '0-500','500-1000','1000-1500','1500-2000','2000-2500','2500-3000','3000-3500','3500-4000','4000-4500','4500-5000','5000-5500','5500-6000',
-                                    '6000-6500','6500-7000','7000-7500','7500-8000','8000-8500','8500-9000','>9000']
+                                data: ['0-500', '500-1000', '1000-1500', '1500-2000', '2000-2500', '2500-3000', '3000-3500', '3500-4000', '4000-4500', '4500-5000', '5000-5500', '5500-6000',
+                                    '6000-6500', '6500-7000', '7000-7500', '7500-8000', '8000-8500', '8500-9000', '>9000']
                             }
                         },
                         series: [{
@@ -237,15 +245,15 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                                 name: '风控事件单量', type: 'pie',
                                 radius: '80%',
                                 center: ['50%', '58%'],
-                                label:{            //饼图图形上的文本标签
-                                    normal:{
-                                        show:true,
-                                        position:'outer', //标签的位置
-                                        textStyle : {
-                                            fontWeight : 300 ,
-                                            fontSize : 16    //文字的字体大小
+                                label: {            //饼图图形上的文本标签
+                                    normal: {
+                                        show: true,
+                                        position: 'outer', //标签的位置
+                                        textStyle: {
+                                            fontWeight: 300,
+                                            fontSize: 16    //文字的字体大小
                                         },
-                                        formatter:'{d}%'
+                                        formatter: '{d}%'
                                     }
                                 },
                                 itemStyle: {
@@ -269,12 +277,32 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
             function ($scope, $state, $http, $uibModal, $filter, Upload, commonDialog, riskEvent, orderService) {
 
                 $scope.orderTypes = orderTypesMap;
+                $scope.mailTemplate = mailTemplate;
                 $scope.resultTypes = resultTypesMap;
                 $scope.channelResults = channelResultArray;
                 if (riskEvent.data.is_send_client == 1)
                     riskEvent.data.is_send_client = true;
                 $scope.riskEvent = riskEvent.data;
 
+                $scope.checkTemplate = function () {
+                    var url = "";
+                    switch ($scope.riskEvent.mail_template) {
+                        case "1":
+                            url = "https://file.royalpay.com.au/open/2019/03/27/1553658222567_BzfAtsEgsBdMQLl3jGOAlfcYmFUL1F.png";
+                            break;
+                        case "2":
+                            url = "https://file.royalpay.com.au/open/2019/03/27/1553658193577_ddF4FAQYBaMx2oCEUlD2f2NtW3SxYD.png";
+                            break;
+                        case "3":
+                            url = "https://file.royalpay.com.au/open/2019/03/27/1553658238130_VJPI3RNmyKtcOgsV8w8yswUsYMFvGs.png\n";
+                            break;
+                        default:
+                            break;
+                    }
+                    window.open(url, '_blank');
+                };
+
+
                 $http.get('/risk/business/process/logs/' + $scope.riskEvent.risk_id).then(function (resp) {
                     $scope.riskEvent.process_logs = resp.data;
                 });
@@ -300,7 +328,11 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                     }).then(function () {
                         $http.delete('/risk/business/ban/' + $scope.riskEvent.risk_id).then(function () {
                             $state.go('analysis_monitoring.risk_business');
-                            commonDialog.alert({title: 'Delete', content: 'Risk Event Already Disabled', type: 'error'});
+                            commonDialog.alert({
+                                title: 'Delete',
+                                content: 'Risk Event Already Disabled',
+                                type: 'error'
+                            });
                         }, function (resp) {
                             commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
                         })
@@ -344,7 +376,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
 
                 // 控制编辑表格的显示
                 $scope.editFlag = false;
-                $scope.changeEditFlag = function(editFlag) {
+                $scope.changeEditFlag = function (editFlag) {
                     $scope.editFlag = !editFlag;
                     // 如果是在编辑状态，需要将日期转换为date类型（前端控件需要）
                     // 如果是在非编辑状态，需要将日期转换为yyyy-MM-dd格式
@@ -357,7 +389,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                     }
                 };
 
-                $scope.save = function(form) {
+                $scope.save = function (form) {
                     if (form.$invalid) {
                         angular.forEach(form, function (item, key) {
                             if (key.indexOf('$') < 0) {
@@ -416,7 +448,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                 };
 
                 // 关停商户
-                $scope.updateClient = function(isValid, temporaryFlag) {
+                $scope.updateClient = function (isValid, temporaryFlag) {
                     $scope.riskEvent.temporary_close_merchant = temporaryFlag;
                     commonDialog.confirm({
                         title: 'Warning',
@@ -453,8 +485,8 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                 };
 
                 // 以下为BD上传材料相关
-                $scope.material={};
-                $scope.uploadFile = function(files, index) {
+                $scope.material = {};
+                $scope.uploadFile = function (files, index) {
                     if (files && files.length) {
                         var urls = new Array();
                         var value = 0;
@@ -470,8 +502,8 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                                 delete $scope.allMaterialInfo.material[index].fileProgressValue;
                                 alert('Upload Failed');
                             }, function (evt) {
-                                value += parseInt(100 * evt.loaded / evt.total );
-                                $scope.allMaterialInfo.material[index].fileProgressValue = value/(files.length*2);
+                                value += parseInt(100 * evt.loaded / evt.total);
+                                $scope.allMaterialInfo.material[index].fileProgressValue = value / (files.length * 2);
                             })
                         }
                         $scope.allMaterialInfo.material[index].uploadFile = urls;
@@ -480,7 +512,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
 
                 $scope.submit = function (form) {
                     var codeKey = $scope.riskEvent.submit_url.substring($scope.riskEvent.submit_url.lastIndexOf('=') + 1) || $scope.riskEvent.submit_url.substring($scope.riskEvent.submit_url.lastIndexOf('/') + 1);
-                    $scope.material.update_time=$filter('date')(new Date(), 'yyyy-MM-dd HH:mm:ss');
+                    $scope.material.update_time = $filter('date')(new Date(), 'yyyy-MM-dd HH:mm:ss');
                     $scope.material.risk_id = $scope.riskEvent.risk_id;
                     for (var i = 0; i < $scope.allMaterialInfo.material.length; i++) {
                         var key = 'file' + (i + 1) + "_url";
@@ -504,12 +536,12 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                 };
 
                 // 加载提交材料
-                $scope.loadRiskMaterial = function() {
+                $scope.loadRiskMaterial = function () {
                     // $http.get('/risk/business/' + $scope.riskEvent.risk_id + '/material').then(function(resp) {
                     //     $scope.material = resp.data;
                     // });
 
-                    $http.get('/risk/business/' + $scope.riskEvent.risk_id + '/all_material_info').then(function(resp) {
+                    $http.get('/risk/business/' + $scope.riskEvent.risk_id + '/all_material_info').then(function (resp) {
                         $scope.allMaterialInfo = resp.data;
                         if ($scope.uploadShowFlag) {
                             $scope.allMaterialInfo.description = '';
@@ -534,7 +566,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
 
                 // 加载提交材料
                 // $scope.fileObject = {};
-                $scope.loadRiskMaterial = function() {
+                $scope.loadRiskMaterial = function () {
                     // $http.get('/risk/business/' + $scope.riskEvent.risk_id + '/material').then(function(resp) {
                     //     $scope.riskMaterial = resp.data;
                     //     $scope.file1 = resp.data.file1;
@@ -552,7 +584,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                     //     // $scope.fileLength = Object.keys($scope.fileObject).length;
                     // })
 
-                    $http.get('/risk/business/' + $scope.riskEvent.risk_id + '/all_material_info').then(function(resp) {
+                    $http.get('/risk/business/' + $scope.riskEvent.risk_id + '/all_material_info').then(function (resp) {
                         $scope.riskMaterial = resp.data;
                     });
                 };
@@ -562,7 +594,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                 $scope.uploadShowFlag = ($scope.riskEvent.result_type == 1 || $scope.riskEvent.result_type == 3 || $scope.riskEvent.result_type == 4) ? true : false;
 
                 // 材料上传
-                $scope.uploadFile = function(files, index) {
+                $scope.uploadFile = function (files, index) {
                     if (files && files.length) {
                         var urls = new Array();
                         var value = 0;
@@ -579,8 +611,8 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                                 delete $scope.riskMaterial.material[index].fileProgressValue;
                                 alert('Upload Failed');
                             }, function (evt) {
-                                value += parseInt(100 * evt.loaded / evt.total );
-                                $scope.riskMaterial.material[index].fileProgressValue = value/(files.length*2);
+                                value += parseInt(100 * evt.loaded / evt.total);
+                                $scope.riskMaterial.material[index].fileProgressValue = value / (files.length * 2);
                             })
                         }
                         $scope.riskMaterial.material[index].file = urls;
@@ -592,7 +624,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                     if (index < 0)
                         index = $scope.riskEvent.submit_url.lastIndexOf('/');
                     var codeKey = $scope.riskEvent.submit_url.substring(index + 1);
-                    $scope.material.update_time=$filter('date')(new Date(), 'yyyy-MM-dd HH:mm:ss');
+                    $scope.material.update_time = $filter('date')(new Date(), 'yyyy-MM-dd HH:mm:ss');
                     $scope.material.risk_id = $scope.riskEvent.risk_id;
                     for (var i = 0; i < $scope.riskMaterial.material.length; i++) {
                         var key = 'file' + (i + 1) + "_url";
@@ -616,7 +648,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                 };
 
                 // 材料审核
-                $scope.auditMaterial = function(auditType) {
+                $scope.auditMaterial = function (auditType) {
 
                     var url = '/risk/business/events/pass';
                     var warningMessageHTML = '是否确定<span style="color: green; font-weight: bolder; font-size: 20px;">通过</span>该材料？';
@@ -665,31 +697,50 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                 $scope.receive_email_date = new Date();
                 $scope.today = new Date();
                 $scope.orderTypes = orderTypesMap;
+                $scope.mailTemplate = mailTemplate;
                 $scope.royapayOrderTypes = royalpayOrderTypesMap;
                 $scope.warningOrderTypes = warningOrderTypesMap;
                 $scope.materials = [{key: 0, value: ""}];
                 $scope.canMinus = false;
                 $scope.riskEvent = {};
-                $scope.increase = function($index) {
+                $scope.checkTemplate = function () {
+                    var url = "";
+                    switch ($scope.riskEvent.mail_template) {
+                        case "1":
+                            url = "https://file.royalpay.com.au/open/2019/03/27/1553658222567_BzfAtsEgsBdMQLl3jGOAlfcYmFUL1F.png";
+                            break;
+                        case "2":
+                            url = "https://file.royalpay.com.au/open/2019/03/27/1553658193577_ddF4FAQYBaMx2oCEUlD2f2NtW3SxYD.png";
+                            break;
+                        case "3":
+                            url = "https://file.royalpay.com.au/open/2019/03/27/1553658238130_VJPI3RNmyKtcOgsV8w8yswUsYMFvGs.png\n";
+                            break;
+                        default:
+                            break;
+                    }
+                    window.open(url, '_blank');
+                };
+
+                $scope.increase = function ($index) {
                     $scope.materials.splice($index + 1, 0,
-                             {key: new Date().getTime(), value: ""});   // 用时间戳作为每个item的key
-                        // 增加新的input后允许删除
+                        {key: new Date().getTime(), value: ""});   // 用时间戳作为每个item的key
+                    // 增加新的input后允许删除
                     $scope.canMinus = true;
                 };
 
-                $scope.decrease = function($index) {
+                $scope.decrease = function ($index) {
                     // 如果input大于1，删除
-                   if ($scope.materials.length > 1) {
-                       $scope.materials.splice($index, 1);
-                   }
-                   // 如果回复数为1，不允许删除
-                   if ($scope.materials.length == 1) {
-                       $scope.canMinus = false;
-                   }
+                    if ($scope.materials.length > 1) {
+                        $scope.materials.splice($index, 1);
+                    }
+                    // 如果回复数为1，不允许删除
+                    if ($scope.materials.length == 1) {
+                        $scope.canMinus = false;
+                    }
                 };
-                var array=new Array();
+                var array = new Array();
                 var validIndex = 0;
-                $scope.combineMaterials = function() {
+                $scope.combineMaterials = function () {
                     for (var i = 0; i < $scope.materials.length; i++) {
                         var value = $scope.materials[i].value;
                         if (value == '')
@@ -705,10 +756,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                 };
 
                 $scope.is_send_client = false;
-                $scope.changeIsSendClient = function(flag) {
+                $scope.changeIsSendClient = function (flag) {
                     $scope.is_send_client = flag
                 };
-                $scope.save = function(form) {
+                $scope.save = function (form) {
                     if (form.$invalid) {
                         angular.forEach(form, function (item, key) {
                             if (key.indexOf('$') < 0) {
@@ -746,7 +797,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                             content: 'Register new riskEvent successfully',
                             type: 'success'
                         });
-                        $state.go('^',{}, {reload: true});
+                        $state.go('^', {}, {reload: true});
                     }, function (resp) {
                         saveRiskBtn.innerHTML = saveRiskBtnInnerHtmlBak;
                         saveRiskBtn.disabled = false;
@@ -758,7 +809,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                     });
                 };
                 $scope.partnerParam = {};
-                $scope.loadParnters = function() {
+                $scope.loadParnters = function () {
                     $scope.partnerParam.sub_merchant_id = $scope.riskEvent.sub_merchant_id;
                     $http.get('/risk/business/partners', {params: $scope.partnerParam}).then(function (resp) {
                         $scope.partners = resp.data;
@@ -793,34 +844,40 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
         ]);
 
         // 调单类型过滤器
-        app.filter('orderType', function() {
-            return function(type) {
+        app.filter('orderType', function () {
+            return function (type) {
                 return orderTypesMap[type];
             }
         });
 
-        app.filter('royalPayOrderType', function() {
-            return function(type) {
+        app.filter('templateType', function () {
+            return function (type) {
+                return mailTemplate[type];
+            }
+        });
+
+        app.filter('royalPayOrderType', function () {
+            return function (type) {
                 return royalpayOrderTypesMap[type];
             }
         });
 
-        app.filter('warningOrderType', function() {
-            return function(type) {
+        app.filter('warningOrderType', function () {
+            return function (type) {
                 return warningOrderTypesMap[type];
             }
         });
 
         // 处理结果过滤器
-        app.filter('resultType', function() {
-            return function(type, resultTypesMap) {
+        app.filter('resultType', function () {
+            return function (type, resultTypesMap) {
                 return resultTypesMap[type];
             }
         });
 
         // 邮件发送状态过滤器
-        app.filter('emailStatus', function() {
-            return function(status) {
+        app.filter('emailStatus', function () {
+            return function (status) {
                 return emailStatusMap[status];
             }
         });
diff --git a/src/main/ui/static/analysis/templates/new_riskEvent.html b/src/main/ui/static/analysis/templates/new_riskEvent.html
index b678c4570..f0a64110f 100644
--- a/src/main/ui/static/analysis/templates/new_riskEvent.html
+++ b/src/main/ui/static/analysis/templates/new_riskEvent.html
@@ -230,6 +230,32 @@
                                     </div>
                             </div>
 
+                            <div class="form-group"
+                                 ng-class="{'has-error':riskEventForm.mail_template.$invalid && riskEventForm.mail_template.$dirty}">
+                                <label class="control-label col-sm-2"
+                                       for="mail-template-input">WEB/Mail Template
+                                </label>
+                                <div class="col-sm-6">
+                                    <select class="form-control"
+                                            name="mail_template"
+                                            ng-model="riskEvent.mail_template"
+                                            id="mail-template-input"
+                                            required
+                                            ng-options="key as value for (key, value) in mailTemplate">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="riskEventForm.mail_template.$error"
+                                         ng-if="riskEventForm.mail_template.$dirty">
+                                        <p class="small text-danger"
+                                           ng-message="required">required field
+                                        </p>
+                                    </div>
+                                </div>
+                                <div class="col-sm-2" ng-if="riskEvent.mail_template">
+                                    <button class="btn btn-link" ng-click="checkTemplate()">查看模板</button>
+                                </div>
+                            </div>
+
                             <div class="form-group" ng-if="riskEvent.order_type != 5">
                                 <label class="control-label col-sm-2">是否发送商户</label>
                                 <div class="col-xs-6">
diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html
index 5c33d0ef6..ecbb960cc 100644
--- a/src/main/ui/static/analysis/templates/riskEvent_detail.html
+++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html
@@ -156,6 +156,15 @@
                                                     </div>
                                                 </div>
 
+                                                <div class="form-group" ng-if="riskEvent.mail_template">
+                                                    <label class="control-label col-sm-2">WEB/Mail Template</label>
+                                                    <div class="col-sm-10">
+                                                        <p class="form-control-static"
+                                                           ng-bind="riskEvent.mail_template | templateType">
+                                                        </p>
+                                                    </div>
+                                                </div>
+
                                                 <div class="form-group">
                                                     <label class="control-label col-sm-2">是否发送商户</label>
                                                     <div class="col-xs-6">
@@ -524,6 +533,33 @@
                                                 </div>
                                             </div>
 
+                                            <div class="form-group"
+                                                 ng-class="{'has-error':riskEventForm.mail_template.$invalid && riskEventForm.mail_template.$dirty}">
+                                                <label class="control-label col-sm-2"
+                                                       for="mail-template-input">WEB/Mail Template
+                                                </label>
+                                                <div class="col-sm-6">
+                                                    <select class="form-control"
+                                                            name="mail_template"
+                                                            ng-model="riskEvent.mail_template"
+                                                            id="mail-template-input"
+                                                            required
+                                                            ng-options="key as value for (key, value) in mailTemplate">
+                                                        <option value="">Please Choose</option>
+                                                    </select>
+                                                    <div ng-messages="riskEventForm.mail_template.$error"
+                                                         ng-if="riskEventForm.mail_template.$dirty">
+                                                        <p class="small text-danger"
+                                                           ng-message="required">required field
+                                                        </p>
+                                                    </div>
+                                                </div>
+                                                <div class="col-sm-2" ng-if="riskEvent.mail_template">
+                                                    <button class="btn btn-link" ng-click="checkTemplate()">查看模板</button>
+                                                </div>
+                                            </div>
+
+
                                             <div class="form-group" ng-if="riskEvent.order_type != 5">
                                                 <label class="control-label col-sm-2">是否发送商户</label>
                                                 <div class="col-xs-6">

From e25bbbbc530e1551d2b2321cc53e5cbac48c32ee Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 27 Mar 2019 15:27:06 +0800
Subject: [PATCH 24/38] fix

---
 src/main/ui/static/analysis/templates/riskEvent_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html
index ecbb960cc..b87da2879 100644
--- a/src/main/ui/static/analysis/templates/riskEvent_detail.html
+++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html
@@ -541,7 +541,7 @@
                                                 <div class="col-sm-6">
                                                     <select class="form-control"
                                                             name="mail_template"
-                                                            ng-model="riskEvent.mail_template"
+                                                            ng-model="riskEventEdit.mail_template"
                                                             id="mail-template-input"
                                                             required
                                                             ng-options="key as value for (key, value) in mailTemplate">

From a658c1958fb1bfbbffa1160a3d9ea3990a3f42a4 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Wed, 27 Mar 2019 21:09:07 +0800
Subject: [PATCH 25/38] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B7=BB=E5=8A=A0pos?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  5 ---
 .../mappers/system/ClientDeviceMapper.java    |  3 +-
 .../core/impls/ClientManagerImpl.java         | 39 ++++++++++---------
 .../web/PartnerManageController.java          |  6 +--
 .../merchants/web/PartnerViewController.java  |  2 +-
 .../static/payment/partner/partner-manage.js  |  7 ++--
 .../payment/partner/templates/add_device.html | 37 +++++++++---------
 .../partner/templates/partner_devices.html    |  2 +-
 8 files changed, 49 insertions(+), 52 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5b0475543..d83acbcda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,11 +53,6 @@
             <artifactId>jpinyin</artifactId>
             <version>1.1.7</version>
         </dependency>
-        <dependency>
-            <groupId>com.globalfreepay.payment</groupId>
-            <artifactId>payment-core</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>au.com.royalpay.payment</groupId>
             <artifactId>bestpay-core</artifactId>
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.java
index 80f9f8225..cc87aaed2 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceMapper.java
@@ -31,7 +31,8 @@ public interface ClientDeviceMapper {
     JSONObject findByClientDevIdAndClientType(@Param("client_dev_id") String clientDevId, @Param("client_type") String clientType);
 
     @AutoSql(type = SqlType.SELECT)
-    JSONObject findByClientDevId(@Param("client_dev_id") String clientDevId);
+    @AdvanceSelect(addonWhereClause = "is_valid=1")
+    JSONObject findDeviceInfoByDeviceNo(@Param("client_dev_id") String clientDevId,@Param("dev_type") String devType);
 
     PageList<JSONObject> listClientDevices(JSONObject params, PageBounds pagination);
 
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 187ff26dd..aa8b9751c 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
@@ -67,6 +67,7 @@ import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
 import au.com.royalpay.payment.tools.exceptions.NotFoundException;
 import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
 import au.com.royalpay.payment.tools.exceptions.event.WechatExceptionEvent;
+import au.com.royalpay.payment.tools.inspiry.core.InspiryPOSFinder;
 import au.com.royalpay.payment.tools.locale.LocaleSupport;
 import au.com.royalpay.payment.tools.lock.Locker;
 import au.com.royalpay.payment.tools.mail.SendMail;
@@ -2073,27 +2074,21 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
-    public void addDevice(JSONObject manager, String clientMoniker,JSONObject device) {
+    @Transactional
+    public void addDevice(JSONObject manager, String clientMoniker, JSONObject newDevice) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);
         if (client == null) {
             throw new InvalidShortIdException();
         }
         checkOrgPermission(manager, client);
-
-        String clientDevId = device.getString("client_dev_id");
-        JSONObject dev = clientDeviceMapper.findByClientDevId(clientDevId);
-        if(dev == null){
-            throw new NotFoundException("设备不存在");
-        }
-        if (dev.getIntValue("client_id") != client.getIntValue("client_id")) {
-            if(dev.getIntValue("is_valid") == 1){
-                throw new BadRequestException("其他商户正在使用");
-            }
+        String clientDevId = newDevice.getString("client_dev_id");
+        JSONObject dev = clientDeviceMapper.findDeviceInfoByDeviceNo(clientDevId, InspiryPOSFinder.INSPIRY_DEVICE_TYPE);
+        if (dev != null) {
+            throw new ServerErrorException(clientDevId + "当前设备已被使用");
         }
-        device.put("dev_id",dev.getString("dev_id"));
-        device.put("client_id",client.getIntValue("client_id"));
-        device.put("remark",dev.getString("remark"));
-        clientDeviceMapper.update(device);
+        newDevice.put("client_id", client.getString("client_id"));
+        newDevice.put("create_time", new Date());
+        clientDeviceMapper.save(newDevice);
     }
 
     @Override
@@ -2118,12 +2113,18 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             throw new InvalidShortIdException();
         }
         checkOrgPermission(manager, client);
-        JSONObject dev = clientDeviceMapper.find(devId);
-        if (dev.getIntValue("client_id") != client.getIntValue("client_id")) {
+        JSONObject deviceInfo = clientDeviceMapper.find(devId);
+        if (deviceInfo.getIntValue("client_id") != client.getIntValue("client_id")) {
             throw new NotFoundException("设备不存在");
         }
-        dev.put("is_valid", enable);
-        clientDeviceMapper.update(dev);
+        if (StringUtils.equals(InspiryPOSFinder.INSPIRY_DEVICE_TYPE, deviceInfo.getString("dev_type"))) {
+            JSONObject inspiryDevice = clientDeviceMapper.findDeviceInfoByDeviceNo(deviceInfo.getString("client_dev_id"), InspiryPOSFinder.INSPIRY_DEVICE_TYPE);
+            if (inspiryDevice != null) {
+                throw new ServerErrorException("当前设备已被使用");
+            }
+        }
+        deviceInfo.put("is_valid", enable);
+        clientDeviceMapper.update(deviceInfo);
     }
 
     @Override
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
index 97487d462..5da10fe4e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
@@ -456,10 +456,10 @@ public class PartnerManageController {
     }
 
     //给商户新增设备
-    @ManagerMapping(value = "/{clientMoniker}/addDevices", method = RequestMethod.POST, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.BD_USER})
+    @ManagerMapping(value = "/{clientMoniker}/add_device", method = RequestMethod.POST, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.BD_USER})
     public void addDevice(@PathVariable String clientMoniker, @RequestBody JSONObject device,
-                             @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
-        clientManager.addDevice(manager, clientMoniker,device);
+                          @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+        clientManager.addDevice(manager, clientMoniker, device);
     }
 
     @ManagerMapping(value = "/{clientMoniker}/devices/{devId}", method = RequestMethod.PUT, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.BD_USER})
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
index 0b3af823a..3c232773b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
@@ -201,7 +201,7 @@ public class PartnerViewController {
     @PartnerMapping(value = "/accounts/{accountId}", method = RequestMethod.DELETE, roles = PartnerRole.ADMIN)
     @ResponseBody
     public void disableAccount(@PathVariable String accountId, @ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account) {
-        if (accountId == account.getString("account_id")) {
+        if (accountId.equals(account.getString("account_id"))) {
             throw new BadRequestException("You cannot disable yourself");
         }
         clientManager.disableAccount(null, account.getString("client_moniker"), accountId);
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 99d039abb..a00546187 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -2838,7 +2838,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         /**
          * 添加设备
          */
-        $scope.addDevices = function () {
+        $scope.addDevice = function () {
             $uibModal.open({
                 templateUrl: '/static/payment/partner/templates/add_device.html',
                 controller: 'newDeviceDialogCtrl',
@@ -2848,7 +2848,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     }
                 }
             }).result.then(function () {
-                $scope.listDevices();
+                $scope.listDevices(1);
             })
         };
 
@@ -3002,8 +3002,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 });
                 return;
             }
-
-            $http.post('/sys/partners/' + clientMoniker + '/addDevices', $scope.device).then(function () {
+            $http.post('/sys/partners/' + clientMoniker + '/add_device', $scope.device).then(function () {
                 $scope.$close();
             }, function (resp) {
                 $scope.errmsg = resp.data.message;
diff --git a/src/main/ui/static/payment/partner/templates/add_device.html b/src/main/ui/static/payment/partner/templates/add_device.html
index a86ab0240..bb45fc955 100644
--- a/src/main/ui/static/payment/partner/templates/add_device.html
+++ b/src/main/ui/static/payment/partner/templates/add_device.html
@@ -4,52 +4,53 @@
 <div class="modal-body">
     <div class="row">
         <div class="col-sm-12">
-            <form novalidate name="accountForm">
+            <form novalidate name="deviceForm">
                 <div class="form-group"
-                     ng-class="{'has-error':accountForm.client_dev_id.$invalid && accountForm.client_dev_id.$dirty}">
+                     ng-class="{'has-error':deviceForm.client_dev_id.$invalid && deviceForm.client_dev_id.$dirty}">
                     <label class="control-label" for="client_dev_id-input">* 设备编号</label>
                     <input required class="form-control text-lowercase" id="client_dev_id-input" name="client_dev_id"
                            ng-model="device.client_dev_id" maxlength="50">
-                    <div ng-messages="accountForm.client_dev_id.$error" ng-if="accountForm.client_dev_id.$dirty">
+                    <div ng-messages="deviceForm.client_dev_id.$error" ng-if="deviceForm.client_dev_id.$dirty">
                         <p class="small text-danger" ng-message="required">client_dev_id field is required</p>
                     </div>
                 </div>
                 <div class="form-group"
-                     ng-class="{'has-error':accountForm.auth_code.$invalid && accountForm.auth_code.$dirty}">
+                     ng-class="{'has-error':deviceForm.auth_code.$invalid && deviceForm.auth_code.$dirty}">
                     <label class="control-label" for="auth_code-input">* 设备密钥</label>
                     <input required class="form-control" id="auth_code-input" name="auth_code"
                            ng-model="device.auth_code" maxlength="50">
-                    <div ng-messages="accountForm.auth_code.$error" ng-if="accountForm.auth_code.$dirty">
+                    <div ng-messages="deviceForm.auth_code.$error" ng-if="deviceForm.auth_code.$dirty">
                         <p class="small text-danger" ng-message="required">设备密钥 field is required</p>
                     </div>
                 </div>
-                <div class="form-group"
-                     ng-class="{'has-error':accountForm.client_type.$invalid && accountForm.client_type.$dirty}">
-                    <label class="control-label" for="client_type-input">* 设备类型</label>
-                    <input required class="form-control" id="client_type-input" name="client_type"
-                           ng-model="device.client_type">
-                    <div ng-messages="accountForm.auth_code.$error" ng-if="accountForm.auth_code.$dirty">
-                        <p class="small text-danger" ng-message="required">设备类型 field is required</p>
-                    </div>
+                <div class="form-group">
+                    <label class="control-label" for="client_type-input">设备类型</label>
+                    <input class="form-control" id="client_type-input" name="client_type"
+                           ng-model="device.client_type" value="inspiry" readonly>
                 </div>
 
                 <div class="form-group"
-                     ng-class="{'has-error':accountForm.version.$invalid && accountForm.version.$dirty}">
+                     ng-class="{'has-error':deviceForm.version.$invalid && deviceForm.version.$dirty}">
                     <label class="control-label" for="version-input">* version</label>
                     <input required class="form-control" id="version-input" name="version"
                            ng-model="device.version">
-                    <div ng-messages="accountForm.auth_code.$error" ng-if="accountForm.auth_code.$dirty">
+                    <div ng-messages="deviceForm.version.$error" ng-if="deviceForm.version.$dirty">
                         <p class="small text-danger" ng-message="required">version field is required</p>
                     </div>
                 </div>
-
-            </form>
+                <div class="form-group">
+                    <label class="control-label" for="remark-input">Remark</label>
+                    <input class="form-control" id="remark-input" name="version"
+                           ng-model="device.remark">
+                </div>
         </div>
+        </form>
     </div>
 </div>
+</div>
 <div class="modal-footer">
     <div class="btn-group">
-        <button class="btn btn-success" type="button" ng-click="save(accountForm)">Submit</button>
+        <button class="btn btn-success" type="button" ng-click="save(deviceForm)">Submit</button>
     </div>
     <div class="btn-group">
         <button class="btn btn-danger" type="button" ng-click="$dismiss()">Cancel</button>
diff --git a/src/main/ui/static/payment/partner/templates/partner_devices.html b/src/main/ui/static/payment/partner/templates/partner_devices.html
index fc28c9ce9..e61a489b7 100644
--- a/src/main/ui/static/payment/partner/templates/partner_devices.html
+++ b/src/main/ui/static/payment/partner/templates/partner_devices.html
@@ -8,7 +8,7 @@
                         <button class="btn btn-success" ng-click="listDevices()">
                             <i class="fa fa-search"></i>
                         </button>
-                        <button class="btn btn-primary" ng-click="addDevices()">
+                        <button class="btn btn-primary" ng-click="addDevice()">
                             <i class="fa fa-plus"></i> addDevice
                         </button>
                     </div>

From 68ce23af11b129a407d4fa48031bbe7acfe289f9 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Wed, 27 Mar 2019 21:19:07 +0800
Subject: [PATCH 26/38] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/partner/templates/add_device.html | 72 +++++++++----------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/add_device.html b/src/main/ui/static/payment/partner/templates/add_device.html
index bb45fc955..2f6a191f7 100644
--- a/src/main/ui/static/payment/partner/templates/add_device.html
+++ b/src/main/ui/static/payment/partner/templates/add_device.html
@@ -3,47 +3,45 @@
 </div>
 <div class="modal-body">
     <div class="row">
-        <div class="col-sm-12">
-            <form novalidate name="deviceForm">
-                <div class="form-group"
-                     ng-class="{'has-error':deviceForm.client_dev_id.$invalid && deviceForm.client_dev_id.$dirty}">
-                    <label class="control-label" for="client_dev_id-input">* 设备编号</label>
-                    <input required class="form-control text-lowercase" id="client_dev_id-input" name="client_dev_id"
-                           ng-model="device.client_dev_id" maxlength="50">
-                    <div ng-messages="deviceForm.client_dev_id.$error" ng-if="deviceForm.client_dev_id.$dirty">
-                        <p class="small text-danger" ng-message="required">client_dev_id field is required</p>
-                    </div>
+        <form novalidate name="deviceForm">
+            <div class="form-group"
+                 ng-class="{'has-error':deviceForm.client_dev_id.$invalid && deviceForm.client_dev_id.$dirty}">
+                <label class="control-label" for="client_dev_id-input">* 设备编号</label>
+                <input required class="form-control text-lowercase" id="client_dev_id-input" name="client_dev_id"
+                       ng-model="device.client_dev_id" maxlength="50">
+                <div ng-messages="deviceForm.client_dev_id.$error" ng-if="deviceForm.client_dev_id.$dirty">
+                    <p class="small text-danger" ng-message="required">client_dev_id field is required</p>
                 </div>
-                <div class="form-group"
-                     ng-class="{'has-error':deviceForm.auth_code.$invalid && deviceForm.auth_code.$dirty}">
-                    <label class="control-label" for="auth_code-input">* 设备密钥</label>
-                    <input required class="form-control" id="auth_code-input" name="auth_code"
-                           ng-model="device.auth_code" maxlength="50">
-                    <div ng-messages="deviceForm.auth_code.$error" ng-if="deviceForm.auth_code.$dirty">
-                        <p class="small text-danger" ng-message="required">设备密钥 field is required</p>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="control-label" for="client_type-input">设备类型</label>
-                    <input class="form-control" id="client_type-input" name="client_type"
-                           ng-model="device.client_type" value="inspiry" readonly>
+            </div>
+            <div class="form-group"
+                 ng-class="{'has-error':deviceForm.auth_code.$invalid && deviceForm.auth_code.$dirty}">
+                <label class="control-label" for="auth_code-input">* 设备密钥</label>
+                <input required class="form-control" id="auth_code-input" name="auth_code"
+                       ng-model="device.auth_code" maxlength="50">
+                <div ng-messages="deviceForm.auth_code.$error" ng-if="deviceForm.auth_code.$dirty">
+                    <p class="small text-danger" ng-message="required">设备密钥 field is required</p>
                 </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label" for="client_type-input">设备类型</label>
+                <input class="form-control" id="client_type-input" name="client_type"
+                       ng-model="device.client_type" ng-init="inspiry" readonly>
+            </div>
 
-                <div class="form-group"
-                     ng-class="{'has-error':deviceForm.version.$invalid && deviceForm.version.$dirty}">
-                    <label class="control-label" for="version-input">* version</label>
-                    <input required class="form-control" id="version-input" name="version"
-                           ng-model="device.version">
-                    <div ng-messages="deviceForm.version.$error" ng-if="deviceForm.version.$dirty">
-                        <p class="small text-danger" ng-message="required">version field is required</p>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="control-label" for="remark-input">Remark</label>
-                    <input class="form-control" id="remark-input" name="version"
-                           ng-model="device.remark">
+            <div class="form-group"
+                 ng-class="{'has-error':deviceForm.version.$invalid && deviceForm.version.$dirty}">
+                <label class="control-label" for="version-input">* version</label>
+                <input required class="form-control" id="version-input" name="version"
+                       ng-model="device.version">
+                <div ng-messages="deviceForm.version.$error" ng-if="deviceForm.version.$dirty">
+                    <p class="small text-danger" ng-message="required">version field is required</p>
                 </div>
-        </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label" for="remark-input">Remark</label>
+                <input class="form-control" id="remark-input" name="version"
+                       ng-model="device.remark">
+            </div>
         </form>
     </div>
 </div>

From 3db0c13c7d85c53cf27223b09e7168056fcf5aaa Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Wed, 27 Mar 2019 21:59:00 +0800
Subject: [PATCH 27/38] =?UTF-8?q?inspiry=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/ClientManagerImpl.java         |  2 +-
 .../static/payment/partner/partner-manage.js  |  4 +-
 .../payment/partner/templates/add_device.html | 79 ++++++++++---------
 3 files changed, 43 insertions(+), 42 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 aa8b9751c..1e794935b 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
@@ -2117,7 +2117,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (deviceInfo.getIntValue("client_id") != client.getIntValue("client_id")) {
             throw new NotFoundException("设备不存在");
         }
-        if (StringUtils.equals(InspiryPOSFinder.INSPIRY_DEVICE_TYPE, deviceInfo.getString("dev_type"))) {
+        if (StringUtils.equals(InspiryPOSFinder.INSPIRY_DEVICE_TYPE, deviceInfo.getString("client_type")) && enable) {
             JSONObject inspiryDevice = clientDeviceMapper.findDeviceInfoByDeviceNo(deviceInfo.getString("client_dev_id"), InspiryPOSFinder.INSPIRY_DEVICE_TYPE);
             if (inspiryDevice != null) {
                 throw new ServerErrorException("当前设备已被使用");
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index a00546187..27e8bb534 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -2989,9 +2989,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
     }]);
 
     app.controller('newDeviceDialogCtrl', ['$scope', '$http', 'clientMoniker', function ($scope, $http,clientMoniker) {
-        $scope.params = {};
-        $scope.manager = {};
-
         $scope.save = function (form) {
             $scope.errmsg = null;
             if (form.$invalid) {
@@ -3002,6 +2999,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 });
                 return;
             }
+            alert($scope.device);
             $http.post('/sys/partners/' + clientMoniker + '/add_device', $scope.device).then(function () {
                 $scope.$close();
             }, function (resp) {
diff --git a/src/main/ui/static/payment/partner/templates/add_device.html b/src/main/ui/static/payment/partner/templates/add_device.html
index 2f6a191f7..884d656d4 100644
--- a/src/main/ui/static/payment/partner/templates/add_device.html
+++ b/src/main/ui/static/payment/partner/templates/add_device.html
@@ -2,49 +2,52 @@
     <h4>New Manager Device</h4>
 </div>
 <div class="modal-body">
-    <div class="row">
-        <form novalidate name="deviceForm">
-            <div class="form-group"
-                 ng-class="{'has-error':deviceForm.client_dev_id.$invalid && deviceForm.client_dev_id.$dirty}">
-                <label class="control-label" for="client_dev_id-input">* 设备编号</label>
-                <input required class="form-control text-lowercase" id="client_dev_id-input" name="client_dev_id"
-                       ng-model="device.client_dev_id" maxlength="50">
-                <div ng-messages="deviceForm.client_dev_id.$error" ng-if="deviceForm.client_dev_id.$dirty">
-                    <p class="small text-danger" ng-message="required">client_dev_id field is required</p>
-                </div>
+    <form novalidate name="deviceForm">
+        <div class="form-group"
+             ng-class="{'has-error':deviceForm.client_dev_id.$invalid && deviceForm.client_dev_id.$dirty}">
+            <label class="control-label" for="client_dev_id-input">* Device No</label>
+            <input required class="form-control text-lowercase" id="client_dev_id-input" name="client_dev_id"
+                   ng-model="device.client_dev_id" maxlength="25">
+            <div ng-messages="deviceForm.client_dev_id.$error" ng-if="deviceForm.client_dev_id.$dirty">
+                <p class="small text-danger" ng-message="required">Device No Cannot Be Empty</p>
             </div>
-            <div class="form-group"
-                 ng-class="{'has-error':deviceForm.auth_code.$invalid && deviceForm.auth_code.$dirty}">
-                <label class="control-label" for="auth_code-input">* 设备密钥</label>
-                <input required class="form-control" id="auth_code-input" name="auth_code"
-                       ng-model="device.auth_code" maxlength="50">
-                <div ng-messages="deviceForm.auth_code.$error" ng-if="deviceForm.auth_code.$dirty">
-                    <p class="small text-danger" ng-message="required">设备密钥 field is required</p>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="control-label" for="client_type-input">设备类型</label>
-                <input class="form-control" id="client_type-input" name="client_type"
-                       ng-model="device.client_type" ng-init="inspiry" readonly>
+        </div>
+        <div class="form-group"
+             ng-class="{'has-error':deviceForm.auth_code.$invalid && deviceForm.auth_code.$dirty}">
+            <label class="control-label" for="auth_code-input">* Device Key</label>
+            <input required class="form-control" id="auth_code-input" name="auth_code"
+                   ng-model="device.auth_code" maxlength="50">
+            <div ng-messages="deviceForm.auth_code.$error" ng-if="deviceForm.auth_code.$dirty">
+                <p class="small text-danger" ng-message="required">Device Key Cannot Be Empty</p>
             </div>
+        </div>
+        <div class="form-group">
+            <label class="control-label" for="client_type-input">Device Type</label>
+            <input class="form-control" id="client_type-input" name="client_type"
+                   ng-init="device.client_type='inspiry'" placeholder="inspiry"
+                   ng-model="device.client_type" readonly>
+        </div>
 
-            <div class="form-group"
-                 ng-class="{'has-error':deviceForm.version.$invalid && deviceForm.version.$dirty}">
-                <label class="control-label" for="version-input">* version</label>
-                <input required class="form-control" id="version-input" name="version"
-                       ng-model="device.version">
-                <div ng-messages="deviceForm.version.$error" ng-if="deviceForm.version.$dirty">
-                    <p class="small text-danger" ng-message="required">version field is required</p>
-                </div>
+        <div class="form-group"
+             ng-class="{'has-error':deviceForm.version.$invalid && deviceForm.version.$dirty}">
+            <label class="control-label" for="version-input">* version</label>
+            <input required class="form-control" id="version-input" name="version"
+                   ng-model="device.version" maxlength="10">
+            <div ng-messages="deviceForm.version.$error" ng-if="deviceForm.version.$dirty">
+                <p class="small text-danger" ng-message="required">Version No Cannot Be Empty</p>
             </div>
-            <div class="form-group">
-                <label class="control-label" for="remark-input">Remark</label>
-                <input class="form-control" id="remark-input" name="version"
-                       ng-model="device.remark">
+        </div>
+        <div class="form-group"
+             ng-class="{'has-error':deviceForm.remark.$invalid && deviceForm.remark.$dirty}">
+            <label class="control-label" for="remark-input">* Remark</label>
+            <input required class="form-control" id="remark-input" name="remark"
+                   ng-model="device.remark" maxlength="50">
+            <div ng-messages="deviceForm.remark.$error" ng-if="deviceForm.remark.$dirty">
+                <p class="small text-danger" ng-message="required">Remark Cannot Be Empty</p>
             </div>
-        </form>
-    </div>
-</div>
+        </div>
+        <div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>
+    </form>
 </div>
 <div class="modal-footer">
     <div class="btn-group">

From bc30a86d48e29c447ddcf2f044112a542e3bb753 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Wed, 27 Mar 2019 22:07:58 +0800
Subject: [PATCH 28/38] ignore

---
 src/main/ui/static/payment/partner/partner-manage.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 27e8bb534..e0f282f15 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -2999,7 +2999,6 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 });
                 return;
             }
-            alert($scope.device);
             $http.post('/sys/partners/' + clientMoniker + '/add_device', $scope.device).then(function () {
                 $scope.$close();
             }, function (resp) {

From 72c7ae90f69cdea0592287b181e7dc7475cdc4fc Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 28 Mar 2019 09:33:56 +0800
Subject: [PATCH 29/38] tmp commit

---
 .../appclient/core/ManageAppService.java      | 10 ++++-
 .../core/impls/ManageAppServiceImp.java       | 44 +++++++++++++++++--
 .../appclient/web/ManageAppController.java    | 23 +++++++++-
 .../FinancialPartnerCommissionMapper.xml      |  3 +-
 .../templates/app/bd_prize_rules.html         |  2 +-
 .../templates/app/org_prize_rules.html        |  2 +-
 6 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
index a45b7110c..74f24e9d8 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
@@ -5,6 +5,7 @@ import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo;
 import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo;
 import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
 import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
+import au.com.royalpay.payment.manage.product.beans.ProductBean;
 import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
 import com.alibaba.fastjson.JSONObject;
 
@@ -64,6 +65,13 @@ public interface ManageAppService {
 
     List<JSONObject>  getBdPrizeList(JSONObject device);
 
-    String getPrizeRulesUrl(JSONObject device);
+    JSONObject getPrizeRulesUrl(JSONObject device);
 
+    JSONObject listProduct(JSONObject device, ProductBean productBean);
+
+    void saveProduct(JSONObject device, ProductBean productBean);
+
+    void updateProduct(JSONObject device, ProductBean productBean);
+
+    void deleteProduct(JSONObject device, String commodity_id);
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index 4ed05b032..30a5b6ce1 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -16,6 +16,8 @@ import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo;
 import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
 import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
+import au.com.royalpay.payment.manage.product.beans.ProductBean;
+import au.com.royalpay.payment.manage.product.core.ClientProduct;
 import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
 import au.com.royalpay.payment.manage.signin.core.ManagerAccountsService;
 import au.com.royalpay.payment.manage.signin.core.SignInAccountService;
@@ -63,6 +65,8 @@ public class ManageAppServiceImp implements ManageAppService {
     private BDPrizeService bdPrizeService;
     @Resource
     private FinancialBDConfigMapper financialBDConfigMapper;
+    @Resource
+    private ClientProduct clientProduct;
 
 
     @Override
@@ -374,14 +378,48 @@ public class ManageAppServiceImp implements ManageAppService {
     }
 
     @Override
-    public String getPrizeRulesUrl(JSONObject device) {
+    public JSONObject getPrizeRulesUrl(JSONObject device) {
         String clientType = device.getString("client_type");
         manageDeviceSupport.findRegister(clientType);
         JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        JSONObject result = new JSONObject();
         if (manager.getIntValue("org_id") == 1) {
-            return "http://192.168.0.49:9002/app/rules/bd";
+            result.put("url", "http://192.168.0.49:9002/app/rules/bd");
         } else {
-            return "http://192.168.0.49:9002/app/rules/org";
+            result.put("url", "http://192.168.0.49:9002/app/rules/org");
         }
+        return result;
+    }
+
+    @Override
+    public JSONObject listProduct(JSONObject device, ProductBean productBean) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        return clientProduct.listAllProduct(manager, productBean);
+    }
+
+    @Override
+    public void saveProduct(JSONObject device, ProductBean productBean) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        clientProduct.saveProduct(manager, productBean);
+    }
+
+    @Override
+    public void updateProduct(JSONObject device, ProductBean productBean) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        clientProduct.updateProduct(manager, productBean);
+    }
+
+    @Override
+    public void deleteProduct(JSONObject device, String commodity_id) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        clientProduct.deleteProduct(manager, commodity_id);
     }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
index 83adccb81..0b32209ab 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -7,6 +7,7 @@ import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo;
 import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
 import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
 import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
+import au.com.royalpay.payment.manage.product.beans.ProductBean;
 import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
 import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient;
@@ -169,8 +170,28 @@ public class ManageAppController {
     }
 
     @RequestMapping(value = "/prize/rules", method = RequestMethod.GET)
-    public String getPrizeRulesUrl(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+    public JSONObject getPrizeRulesUrl(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
         return manageAppService.getPrizeRulesUrl(device);
     }
 
+    @RequestMapping(value = "/product/list", method = RequestMethod.GET)
+    public JSONObject listProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, ProductBean productBean) {
+        return manageAppService.listProduct(device, productBean);
+    }
+
+    @RequestMapping(value = "/product/save", method = RequestMethod.POST)
+    public void saveProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, ProductBean productBean) {
+        manageAppService.saveProduct(device, productBean);
+    }
+
+    @RequestMapping(value = "/product/update", method = RequestMethod.PUT)
+    public void updateProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, ProductBean productBean) {
+        manageAppService.updateProduct(device, productBean);
+    }
+
+    @RequestMapping(value = "/product/delete/{commodity_id}", method = RequestMethod.PUT)
+    public void deleteProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, @PathVariable String commodity_id) {
+        manageAppService.deleteProduct(device, commodity_id);
+    }
+
 }
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
index 3856b6efc..52746ba49 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="au.com.royalpay.payment.manage.mappers.financial.FinancialPartnerCommissionMapper">
     <select id="getOrgPrizeList" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT *
+        SELECT record_id,org_id,`year`,`month`,SUM(gross_amount) gross_amount,SUM(total_charge) total_charge,
+		SUM(royalpay_charge) royalpay_charge,SUM(org_charge) org_charge,SUM(net_charge) net_charge,SUM(share_charge) share_charge
         FROM financial_partner_commission
         WHERE org_id = #{org_id}
         GROUP BY `year`,`month`
diff --git a/src/main/resources/templates/app/bd_prize_rules.html b/src/main/resources/templates/app/bd_prize_rules.html
index 7885015b4..8510450c8 100755
--- a/src/main/resources/templates/app/bd_prize_rules.html
+++ b/src/main/resources/templates/app/bd_prize_rules.html
@@ -40,7 +40,7 @@
 
 </style>
 <body ng-app="bdRulesApp" ng-controller="bdRulesCtrl">
-<div class="box box-info">
+<div class="box box-info" style="margin: 25px">
     <div class="box-body">
         <h4>BD分级提成费率速查表</h4>
         <div class="table-responsive">
diff --git a/src/main/resources/templates/app/org_prize_rules.html b/src/main/resources/templates/app/org_prize_rules.html
index fd5e09c30..cbd015139 100755
--- a/src/main/resources/templates/app/org_prize_rules.html
+++ b/src/main/resources/templates/app/org_prize_rules.html
@@ -22,7 +22,7 @@
 
 </style>
 <body>
-<div>
+<div style="margin: 25px">
     <section class="content">
         <div class="box box-info">
             <div class="box-body container">

From 8431d55341a1fd9401ad709cad5352de13ad6334 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 28 Mar 2019 17:04:40 +0800
Subject: [PATCH 30/38] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=A8=A1=E6=9D=BF=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/dev/web/TestController.java        |  1 -
 .../manage/dev/web/TestMerchantPassword.java  | 68 ++++++++++++-----
 .../core/impls/ClientManagerImpl.java         | 73 ++++++++++++++++---
 3 files changed, 109 insertions(+), 33 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
index 702c3d0cb..bfc731595 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
@@ -449,5 +449,4 @@ public class TestController implements ApplicationEventPublisherAware {
     public void downloadHanyinSecureReports(@PathVariable String date) {
         tradeSecureService.uploadSecureReport(DateTime.parse(date).toDate());
     }
-
 }
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
index 350087924..bcb5677ce 100644
--- 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
@@ -6,6 +6,7 @@ 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 org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -15,8 +16,17 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.crypto.*;
+import javax.crypto.spec.DESKeySpec;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -28,35 +38,53 @@ public class TestMerchantPassword {
     @Resource
     private ManagerMapper managerMapper;
 
-    @RequestMapping(value = "/testMerchantPassword",method = RequestMethod.GET)
-    public String testMerchantPassword(@RequestParam String[] accounts,
+    @WechatMapping(value = "/testMerchantPassword",method = RequestMethod.GET)
+    public String testMerchantPassword(@RequestParam String sign,
                                        @ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser,
-                                       Model modelMap) {
-        if (accounts == null) {
+                                       Model modelMap) throws Exception{
+        if (StringUtils.isBlank(sign)) {
             return null;
         }
+        String openid = wxUser.getString("openid");
         List<JSONObject> royalPayUsers = managerMapper.listRoyalPayUsers();
         List<String> needNotifyUsers = royalPayUsers.stream().filter(user -> StringUtils.isNotEmpty(user.getString("wx_openid")))
                 .map(user -> user.getString("wx_openid")).collect(Collectors.toList());
-        if (!ArrayUtils.contains(needNotifyUsers.toArray(new String[needNotifyUsers.size()]), wxUser.getString("openid"))) {
+        if (!ArrayUtils.contains(needNotifyUsers.toArray(new String[needNotifyUsers.size()]), 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);
-            }
-        }
+        String accounts = new String(AESdecrypt(Base64.decodeBase64(sign.replace("%2B", "+")), openid), "utf-8");
+        JSONArray array = JSONArray.parseArray(accounts);
         modelMap.addAttribute("accounts", array);
         return "testMerchantPassword";
     }
+
+    public static byte[] AESdecrypt(byte[] content, String password) {
+        try {
+            KeyGenerator kgen = KeyGenerator.getInstance("AES");
+            SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
+            random.setSeed(password.getBytes());
+            kgen.init(128, random);
+            SecretKey secretKey = kgen.generateKey();
+            byte[] enCodeFormat = secretKey.getEncoded();
+            SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES");
+            Cipher cipher = Cipher.getInstance("AES");
+            cipher.init(Cipher.DECRYPT_MODE, key);
+            byte[] result = cipher.doFinal(content);
+            return result;
+
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (NoSuchPaddingException e) {
+            e.printStackTrace();
+        } catch (InvalidKeyException e) {
+            e.printStackTrace();
+        } catch (IllegalBlockSizeException e) {
+            e.printStackTrace();
+        } catch (BadPaddingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
 }
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 1e794935b..8bf638d7d 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
@@ -71,6 +71,7 @@ import au.com.royalpay.payment.tools.inspiry.core.InspiryPOSFinder;
 import au.com.royalpay.payment.tools.locale.LocaleSupport;
 import au.com.royalpay.payment.tools.lock.Locker;
 import au.com.royalpay.payment.tools.mail.SendMail;
+import org.apache.commons.codec.binary.Base64;
 import au.com.royalpay.payment.tools.merchants.beans.QRCodeConfig;
 import au.com.royalpay.payment.tools.merchants.beans.UpdateSurchargeDTO;
 import au.com.royalpay.payment.tools.merchants.core.MerchantInfoProvider;
@@ -102,6 +103,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.el.parser.AstNot;
+import org.apache.http.client.utils.URLEncodedUtils;
 import org.dom4j.Element;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -123,17 +125,16 @@ import org.thymeleaf.spring4.SpringTemplateEngine;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.URLEncoder;
+import java.security.InvalidKeyException;
 import java.security.InvalidParameterException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -145,12 +146,17 @@ import java.util.zip.ZipOutputStream;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.crypto.*;
+import javax.crypto.spec.DESKeySpec;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
 import javax.imageio.ImageIO;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.yixblog.platform.http.HttpRequestGenerator;
 import cn.yixblog.platform.http.HttpRequestResult;
+import sun.misc.BASE64Encoder;
 
 import static au.com.royalpay.payment.manage.permission.utils.OrgCheckUtils.checkOrgPermission;
 
@@ -810,7 +816,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         JSONObject yeepayConfigValid =yeePayClientConfigMapper.findMerchantConfig(client.getIntValue("client_id"));
         yeePayClientConfigMapper.updateSubMerchantIdValid(yeepayConfigValid.getString("yeepay_config_id"),0);
-        JSONObject yeepayConfig = yeePayClientConfigMapper.findMerchantConfigBySub(client.getIntValue("client_id"),yeepaySubMerchantInfo.getString("yeepay_sub_merchant_id"));
+        JSONObject yeepayConfig = yeePayClientConfigMapper.findMerchantConfigBySub(client.getIntValue("client_id"), yeepaySubMerchantInfo.getString("yeepay_sub_merchant_id"));
         yeePayClientConfigMapper.updateSubMerchantIdValid(yeepayConfig.getString("yeepay_config_id"),1);
         client.put("yeepay_sub_merchant_id",yeepaySubMerchantInfo.getString("yeepay_sub_merchant_id"));
         clientMapper.update(client);
@@ -4724,15 +4730,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 throw new BadRequestException("邮件发送失败", e);
             }
         }).start();
-        StringBuffer accountsStr = new StringBuffer("?");
-        accounts.forEach(account -> {
-            accountsStr.append("accounts=").append(account.getString("username")).append(",").append(account.getString("password")).append(",").append(account.getIntValue("role")).append(",").append(account.getString("client_moniker")).append("&");
-        });
+
         List<String> needNotifyUsers = royalPayUsers.stream().filter(user -> StringUtils.isNotEmpty(user.getString("wx_openid"))).map(user -> user.getString("wx_openid")).collect(Collectors.toList());
         needNotifyUsers.forEach(userOpenId -> {
             try {
+                String signStr = "?sign=" + AESencrypt(accounts.toString(),userOpenId);
                 MpWechatApi paymentApi = mpWechatApiProvider.getNewPaymentApi();
-                TemplateMessage msg = initSendTestPasswordTemplate(userOpenId, paymentApi.getTemplateId("test-merchant-password"), StringUtils.substring(accountsStr.toString(), 0, accountsStr.length() - 1));
+                TemplateMessage msg = initSendTestPasswordTemplate(userOpenId, paymentApi.getTemplateId("test-merchant-password"), signStr.replace("+", "%2B"));
                 paymentApi.sendTemplateMessage(msg);
             } catch (WechatException e) {
                 logger.error("给{}发送微信消息失败，原因：{}", userOpenId, e.getMessage());
@@ -4757,4 +4761,49 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         MpWechatApi api = mpWechatApiProvider.getNewPaymentApi();
         return api.registerShortUrl(longUrl);
     }
+
+
+    public static String AESencrypt(String content, String password) {
+        try {
+            KeyGenerator kgen = KeyGenerator.getInstance("AES");// 创建AES的Key生产者
+            SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
+            random.setSeed(password.getBytes());
+
+            kgen.init(128, random);// 利用用户密码作为随机数初始化出
+            // 128位的key生产者
+            //加密没关系，SecureRandom是生成安全随机数序列，password.getBytes()是种子，只要种子相同，序列就一样，所以解密只要有password就行
+
+            SecretKey secretKey = kgen.generateKey();// 根据用户密码，生成一个密钥
+
+            byte[] enCodeFormat = secretKey.getEncoded();// 返回基本编码格式的密钥，如果此密钥不支持编码，则返回
+            // null。
+
+            SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES");// 转换为AES专用密钥
+
+            Cipher cipher = Cipher.getInstance("AES");// 创建密码器
+
+            byte[] byteContent = content.getBytes("utf-8");
+
+            cipher.init(Cipher.ENCRYPT_MODE, key);// 初始化为加密模式的密码器
+
+            byte[] result = cipher.doFinal(byteContent);// 加密
+
+            return Base64.encodeBase64String(result);
+
+        } catch (NoSuchPaddingException e) {
+            e.printStackTrace();
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (InvalidKeyException e) {
+            e.printStackTrace();
+        } catch (IllegalBlockSizeException e) {
+            e.printStackTrace();
+        } catch (BadPaddingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
 }

From ca8992219cd4f674735b7f993dbc0957809b7689 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 28 Mar 2019 17:14:24 +0800
Subject: [PATCH 31/38] fix

---
 .../core/impls/ClientManagerImpl.java         | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 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 8bf638d7d..9611df424 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
@@ -4765,31 +4765,18 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
 
     public static String AESencrypt(String content, String password) {
         try {
-            KeyGenerator kgen = KeyGenerator.getInstance("AES");// 创建AES的Key生产者
+            KeyGenerator kgen = KeyGenerator.getInstance("AES");
             SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
             random.setSeed(password.getBytes());
-
-            kgen.init(128, random);// 利用用户密码作为随机数初始化出
-            // 128位的key生产者
-            //加密没关系，SecureRandom是生成安全随机数序列，password.getBytes()是种子，只要种子相同，序列就一样，所以解密只要有password就行
-
-            SecretKey secretKey = kgen.generateKey();// 根据用户密码，生成一个密钥
-
-            byte[] enCodeFormat = secretKey.getEncoded();// 返回基本编码格式的密钥，如果此密钥不支持编码，则返回
-            // null。
-
-            SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES");// 转换为AES专用密钥
-
-            Cipher cipher = Cipher.getInstance("AES");// 创建密码器
-
+            kgen.init(128, random);
+            SecretKey secretKey = kgen.generateKey();
+            byte[] enCodeFormat = secretKey.getEncoded();
+            SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES");
+            Cipher cipher = Cipher.getInstance("AES");
             byte[] byteContent = content.getBytes("utf-8");
-
-            cipher.init(Cipher.ENCRYPT_MODE, key);// 初始化为加密模式的密码器
-
-            byte[] result = cipher.doFinal(byteContent);// 加密
-
+            cipher.init(Cipher.ENCRYPT_MODE, key);
+            byte[] result = cipher.doFinal(byteContent);
             return Base64.encodeBase64String(result);
-
         } catch (NoSuchPaddingException e) {
             e.printStackTrace();
         } catch (NoSuchAlgorithmException e) {

From f222cc265db24621cb30c56cc2f6a51c13c858f0 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 29 Mar 2019 09:12:06 +0800
Subject: [PATCH 32/38] tmp commit

---
 .../manage/appclient/core/impls/ManageAppServiceImp.java      | 2 +-
 .../payment/manage/appclient/web/ManageAppController.java     | 4 ++--
 .../mappers/financial/FinancialPartnerCommissionMapper.xml    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index 30a5b6ce1..1c5fc06da 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -339,7 +339,7 @@ public class ManageAppServiceImp implements ManageAppService {
         if (total == null) {
             total = new JSONObject();
             total.put("total_amount", BigDecimal.ZERO);
-            total.put("org_prize", BigDecimal.ZERO);
+            total.put("total_prize", BigDecimal.ZERO);
         }
         total.put("date", DateFormatUtils.format(monthCal.getTime(), "yyyy-MM"));
         return total;
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
index 0b32209ab..8d0727102 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -180,12 +180,12 @@ public class ManageAppController {
     }
 
     @RequestMapping(value = "/product/save", method = RequestMethod.POST)
-    public void saveProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, ProductBean productBean) {
+    public void saveProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device,@RequestBody ProductBean productBean) {
         manageAppService.saveProduct(device, productBean);
     }
 
     @RequestMapping(value = "/product/update", method = RequestMethod.PUT)
-    public void updateProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, ProductBean productBean) {
+    public void updateProduct(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device,@RequestBody ProductBean productBean) {
         manageAppService.updateProduct(device, productBean);
     }
 
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
index 52746ba49..f1b5ac218 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml
@@ -100,7 +100,7 @@
     <select id="findTotalByOrg" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         SUM(gross_amount) total_amount,
-        SUM(org_charge) org_prize
+        SUM(org_charge) total_prize
         FROM financial_partner_commission
         WHERE org_id=#{org_id} AND year=#{year} AND month=#{month}
     </select>

From 460fe9a28da7888413bfef53000e122cfb10cfc3 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Fri, 29 Mar 2019 10:30:24 +0800
Subject: [PATCH 33/38] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/appclient/beans/RetailLoginInfo.java       | 11 +++++++++++
 .../appclient/web/RetailValidationController.java     |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RetailLoginInfo.java b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RetailLoginInfo.java
index 2effee641..4f4de900c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RetailLoginInfo.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RetailLoginInfo.java
@@ -69,4 +69,15 @@ public class RetailLoginInfo {
     public void setDevId(String devId) {
         this.devId = devId;
     }
+
+    @Override
+    public String toString() {
+        return "RetailLoginInfo{" +
+                "loginId='" + loginId + '\'' +
+                ", password='" + password + '\'' +
+                ", verifyCode='" + verifyCode + '\'' +
+                ", captchaKey='" + captchaKey + '\'' +
+                ", devId='" + devId + '\'' +
+                '}';
+    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
index 5194f557a..2c565e2cb 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java
@@ -12,6 +12,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.code.kaptcha.Producer;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,6 +30,7 @@ import java.io.IOException;
 @RestController
 @RequestMapping("/api/v1.0/retail_valid")
 public class RetailValidationController {
+    Logger logger  = LoggerFactory.getLogger(getClass());
     @Resource
     private Producer captchaProducer;
     @Resource
@@ -47,6 +50,7 @@ public class RetailValidationController {
         HttpUtils.handleValidErrors(errors);
         String codeValue = signInStatusManager.getVerifyCode(loginInfo.getCaptchaKey());
         if (codeValue == null) {
+            logger.error("异常商户信息：" + loginInfo.toString());
             throw new BadRequestException("Verification code has expired");
         }
         if (!codeValue.equals(loginInfo.getVerifyCode())) {

From 0db91f904d06f6e3a281faf57cf052ef43d3c21c Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 29 Mar 2019 10:59:53 +0800
Subject: [PATCH 34/38] =?UTF-8?q?fix=20=E5=90=88=E4=BC=99=E4=BA=BA?=
 =?UTF-8?q?=E6=8F=90=E6=88=90=20=E5=87=8F=E6=8E=89surcharge=5Fcashback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impls/CityPartnerPrizeServiceImpl.java    | 31 ++++++++++++-------
 .../core/impls/ClientManagerImpl.java         |  1 -
 .../mappers/payment/TransactionMapper.xml     |  6 ++--
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
index 59fd46df7..d74261ca3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
@@ -494,12 +494,14 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
             }
 
             for (JSONObject params : oneChannel.getValue()) {
+                BigDecimal tmpClearingAmount = params.getBigDecimal("clearing_amount").subtract(params.getBigDecimal("surcharge_cashback"));
+                BigDecimal channelRate = params.get("org_rate") != null ? params.getBigDecimal("org_rate") : (orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN));
+                BigDecimal tmpTotalSurcharge = tmpClearingAmount.multiply(params.getBigDecimal("surcharge_rate")).setScale(2, RoundingMode.HALF_UP);
                 //增加货币判断
                 int i = currencyScale(params.getString("clearing_currency"));
-
-                total = total.add(params.getBigDecimal("clearing_amount"));
-                total_surage = total_surage.add(params.getBigDecimal("total_surcharge")).setScale(i, RoundingMode.HALF_UP);
-                royalpay_surage = royalpay_surage.add(params.getBigDecimal("clearing_amount").multiply(orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN)).setScale(i, RoundingMode.HALF_UP));
+                total = total.add(tmpClearingAmount);
+                total_surage = total_surage.add(tmpTotalSurcharge).setScale(i, RoundingMode.HALF_UP);
+                royalpay_surage = royalpay_surage.add(tmpClearingAmount.multiply(channelRate).setScale(i, RoundingMode.HALF_UP));
                // net_surage = net_surage.add(getThirdPartyCharge(params.getString("channel"), params.getBigDecimal("clearing_amount"), channelCharge));
                 net_surage = net_surage.add(params.getBigDecimal("channel_surcharge"));
             }
@@ -535,12 +537,15 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
                 channel = "cb_bankpay";
             }
             for (JSONObject params : oneChannel.getValue()) {
+                BigDecimal tmpClearingAmount = params.getBigDecimal("clearing_amount").subtract(params.getBigDecimal("surcharge_cashback"));
+                BigDecimal channelRate = params.get("org_rate") != null ? params.getBigDecimal("org_rate") : (orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN));
+                BigDecimal tmpTotalSurcharge = tmpClearingAmount.multiply(params.getBigDecimal("surcharge_rate")).setScale(2, RoundingMode.HALF_UP);
                 //增加货币判断
                 int i = currencyScale(params.getString("clearing_currency"));
-                BigDecimal parent_surage = params.getBigDecimal("clearing_amount").multiply(parentOrgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN)).setScale(i, RoundingMode.HALF_UP);
-                BigDecimal roy_surage = (params.getBigDecimal("clearing_amount").multiply(orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN)).setScale(i, RoundingMode.HALF_UP));
-                total = total.add(params.getBigDecimal("clearing_amount"));
-                total_surage = total_surage.add(params.getBigDecimal("total_surcharge")).setScale(i, RoundingMode.HALF_UP);
+                BigDecimal parent_surage = tmpClearingAmount.multiply(parentOrgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN)).setScale(i, RoundingMode.HALF_UP);
+                BigDecimal roy_surage = tmpClearingAmount.multiply(channelRate).setScale(i, RoundingMode.HALF_UP);
+                total = total.add(tmpClearingAmount);
+                total_surage = total_surage.add(tmpTotalSurcharge).setScale(i, RoundingMode.HALF_UP);
                 royalpay_surage = royalpay_surage.add(roy_surage);
                 //net_surage = net_surage.add(getThirdPartyCharge(params.getString("channel"), params.getBigDecimal("clearing_amount"), channelCharge));
                 net_surage = net_surage.add(params.getBigDecimal("channel_surcharge"));
@@ -569,7 +574,6 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
         List<JSONObject> amountByChannel = new ArrayList<>();
 
         for (Map.Entry<String, List<JSONObject>> oneChannel : channelMap.entrySet()) {
-            JSONObject rate = merchantInfoProvider.clientCurrentRate(clientId, oneChannel.getValue().get(0).getDate("transaction_time"),oneChannel.getKey());
             String recordId = "";
             if (type == 1) {
                 recordId = financialPartnerCommissionMapper.getRecordId(orgInfo.getInteger("org_id"), year, month, oneChannel.getKey());
@@ -590,6 +594,9 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
             }
 
             for (JSONObject params : oneChannel.getValue()) {
+                BigDecimal tmpClearingAmount = params.getBigDecimal("clearing_amount").subtract(params.getBigDecimal("surcharge_cashback"));
+                BigDecimal channelRate = params.get("org_rate") != null ? params.getBigDecimal("org_rate") : (orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN));
+                BigDecimal tmpTotalSurcharge = tmpClearingAmount.multiply(params.getBigDecimal("surcharge_rate")).setScale(2, RoundingMode.HALF_UP);
                 //增加货币判断
                 int i = currencyScale(params.getString("clearing_currency"));
                 if (total.compareTo(BigDecimal.ZERO)==0 ) {
@@ -604,9 +611,9 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
                     }
                 }
 
-                total = total.add(params.getBigDecimal("clearing_amount"));
-                total_surage = total_surage.add(params.getBigDecimal("total_surcharge")).setScale(i, RoundingMode.HALF_UP);
-                royalpay_surage = royalpay_surage.add(params.getBigDecimal("clearing_amount").multiply(orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN)).setScale(i, RoundingMode.HALF_UP));
+                total = total.add(tmpClearingAmount);
+                total_surage = total_surage.add(tmpTotalSurcharge).setScale(i, RoundingMode.HALF_UP);
+                royalpay_surage = royalpay_surage.add(tmpClearingAmount.multiply(channelRate).setScale(i, RoundingMode.HALF_UP));
                 //net_surage = net_surage.add(getThirdPartyCharge(params.getString("channel"), params.getBigDecimal("clearing_amount"), channelCharge));
                 net_surage = net_surage.add(params.getBigDecimal("channel_surcharge"));
             }
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 9611df424..4d160df30 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
@@ -4740,7 +4740,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 paymentApi.sendTemplateMessage(msg);
             } catch (WechatException e) {
                 logger.error("给{}发送微信消息失败，原因：{}", userOpenId, e.getMessage());
-                publisher.publishEvent(new WechatExceptionEvent(this, e, "测试商户密码修改完成"));
             } catch (Exception e) {
                 logger.error("给{}发送密码重置消息失败,原因: {}", userOpenId, e.getMessage());
             }
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index 6ee34dcd2..cf99392c3 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -684,13 +684,15 @@
                if(t.transaction_type = 'Credit', t.clearing_amount, -t.clearing_amount)     clearing_amount,
                if(t.transaction_type = 'Credit', t.total_surcharge, -t.total_surcharge)     total_surcharge,
                if(t.transaction_type = 'Credit', t.channel_surcharge, -t.channel_surcharge) channel_surcharge,
-               t.order_id
+               t.order_id,
+               t.org_rate,
+               t.surcharge_cashback
         from pmt_transactions t
                  INNER JOIN sys_org so ON t.org_id = so.org_id AND so.is_valid = 1
             AND so.type = 0
             AND so.citypartner = 1 AND so.commission = 1
             AND year(t.transaction_time) = #{year} AND month(t.transaction_time) = #{month}
-            AND t.channel != 'Settlement' AND t.channel != 'System'
+            AND t.channel != 'Settlement' AND t.channel != 'System' AND t.system_generate = 0
         ORDER BY t.client_id asc
         ]]>
     </select>

From d5c5aa22089f555394e68f6385c3e8193a259951 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 1 Apr 2019 10:30:00 +0800
Subject: [PATCH 35/38] tmp commit

---
 .../manage/appclient/core/ManageAppService.java        |  2 ++
 .../appclient/core/impls/ManageAppServiceImp.java      | 10 +++++++++-
 .../manage/appclient/web/ManageAppController.java      |  6 ++++++
 .../manage/merchants/beans/ClientRegisterInfo.java     |  2 ++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
index 74f24e9d8..515113723 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java
@@ -31,6 +31,8 @@ public interface ManageAppService {
 
     void updateClientRegisterInfo(JSONObject device, String clientMoniker, ClientRegisterInfo info);
 
+    void disableClientRegisterInfo(JSONObject device, String clientMoniker);
+
     JSONObject listPartners(JSONObject device, AppMerchantBean query);
 
     JSONObject clientDetail(JSONObject device, String clientMoniker);
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index 1c5fc06da..24b2f674f 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -116,6 +116,14 @@ public class ManageAppServiceImp implements ManageAppService {
         clientManager.updateClientRegisterInfo(manager, clientMoniker, info);
     }
 
+    @Override
+    public void disableClientRegisterInfo(JSONObject device, String clientMoniker) {
+        String clientType = device.getString("client_type");
+        manageDeviceSupport.findRegister(clientType);
+        JSONObject manager = managerMapper.findById(device.getString("manager_id"));
+        clientManager.disableClient(clientMoniker,manager);
+    }
+
     @Override
     public JSONObject listPartners(JSONObject device, AppMerchantBean query) {
         String clientType = device.getString("client_type");
@@ -133,9 +141,9 @@ public class ManageAppServiceImp implements ManageAppService {
                 break;
             case 3:
                 query.setCompleted_contract(true);
+                query.setBd_upload_material(true);
                 break;
             case 4:
-                query.setBd_upload_material(true);
                 break;
             case 5:
                 query.setApply_to_back(true);
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
index 8d0727102..6ceb58eac 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java
@@ -80,6 +80,12 @@ public class ManageAppController {
         manageAppService.updateClientRegisterInfo(device, clientMoniker, info);
     }
 
+    @RequestMapping(value = "/merchant/{clientMoniker}/delete", method = RequestMethod.PUT)
+    public void disablePartnerInfo(@PathVariable String clientMoniker,
+                                  @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) {
+        manageAppService.disableClientRegisterInfo(device, clientMoniker);
+    }
+
     @RequestMapping(value = "/merchants", method = RequestMethod.GET)
     public JSONObject listPartners(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, AppMerchantBean query) {
         return manageAppService.listPartners(device, query);
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
index 8084f0237..cb493a8a4 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
@@ -76,7 +76,9 @@ public class ClientRegisterInfo {
     private String merchant_video_url;
     @JSONField(name = "store_name")
     private String storeName;
+    @NotEmpty(message = "error.payment.valid.param_missing")
     private String client_pay_type;
+    @NotEmpty(message = "error.payment.valid.param_missing")
     private String client_pay_desc;
 
     public JSONObject insertObject() {

From 72d1fe2f188679957fcb623b59036395f0a7256f Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Mon, 1 Apr 2019 16:09:14 +0800
Subject: [PATCH 36/38] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=85=E7=AE=97?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=97=A0=E6=B3=95=E4=B8=8B=E8=BD=BD=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/SignInAccountServiceImpl.java  |  2 +-
 .../core/impls/TradeLogServiceImpl.java       |  1 +
 .../mappers/payment/TransactionMapper.xml     | 13 +++++++++----
 src/main/ui/index.html                        |  2 +-
 src/main/ui/static/payment/partner/partner.js | 19 -------------------
 5 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
index 5b790db1c..81159d1fd 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
@@ -420,7 +420,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
                 "company_phone", "suburb", "postcode", "state", "contact_person", "contact_phone", "contact_email", "short_name", "logo_url", "enable_refund",
                 "enable_refund_auth", "retail_surcharge", "require_custinfo", "require_remark", "logo_thumbnail", "creator", "create_time", "approver",
                 "approve_result", "approve_time", "timezone", "has_children", "source", "customer_surcharge_rate", "enable_alipay", "enable_wechat",
-                "enable_bestpay", "manual_settle", "skip_clearing" ,"mail_confirm"};
+                "enable_bestpay", "manual_settle", "skip_clearing" ,"mail_confirm","surcharge_mode"};
         for (String col : columns) {
             simpleClient.put(col, client.get(col));
         }
diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
index 7639691e5..5683c4782 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
@@ -1302,6 +1302,7 @@ public class TradeLogServiceImpl implements TradeLogService {
         JSONObject client = partner.getJSONObject("client");
         String timezone = client.getString("timezone");
         JSONObject params = query.toParams(timezone);
+        params.put("client_id",client.getString("client_id"));
         List<JSONObject> clientOrderList = transactionMapper.getClientOrderByTransactionTime(params);
         List<Integer> clientOrders = new ArrayList<>(clientOrderList.size());
         clientOrderList.parallelStream().forEach(p->{
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index cf99392c3..9ad45c620 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -1116,10 +1116,15 @@
         SELECT t.clearing_order
         FROM pmt_transactions t
         WHERE t.channel='Settlement'
-        AND t.client_id IN
-        <foreach collection="client_ids" open="(" close=")" separator="," item="clientId">
-            #{clientId}
-        </foreach>
+        <if test="client_ids!=null">
+            AND t.client_id IN
+            <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
+                #{client_id}
+            </foreach>
+        </if>
+        <if test="client_ids==null">
+            and t.client_id=#{client_id}
+        </if>
         <if test="from!=null">and t.transaction_time &gt;= #{from}</if>
         <if test="to!=null">and t.transaction_time &lt; #{to}</if>
     </select>
diff --git a/src/main/ui/index.html b/src/main/ui/index.html
index 8ba265962..57d546216 100644
--- a/src/main/ui/index.html
+++ b/src/main/ui/index.html
@@ -899,7 +899,7 @@ margin-bottom: 10%;"/>
                                     </li>
                                 </ul>
                             </li>
-                            <li ng-if="([1,2]|withRole)">
+                            <li ng-if="([1,2]|withRole) &&(currentUser.client.surcharge_mode=='distributed')">
                                 <ul>
                                     <li>
                                         <a ui-sref="surcharge_account">
diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js
index dfcf180fb..3b1dc7ccc 100644
--- a/src/main/ui/static/payment/partner/partner.js
+++ b/src/main/ui/static/payment/partner/partner.js
@@ -37,15 +37,6 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload','uiBoot
                     return $http.get('/client/partner_info/compliance/files');
                 }]
             }
-        }).state('payment_materials', {
-            url: '/payment_materials',
-            templateUrl: '/static/payment/partner/templates/client_payment_materials.html',
-            controller: 'clientPaymentMaterialCtrl',
-            resolve: {
-                partner: ['$http', function ($http) {
-                    return $http.get('/client/partner_info');
-                }]
-            }
         }).state('basic.clearing_config', {
             url: '/clearing_config',
             templateUrl: '/static/payment/partner/templates/client_bankaccounts.html',
@@ -868,16 +859,6 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload','uiBoot
         };
 
     }]);
-    app.controller('clientPaymentMaterialCtrl', ['$scope', '$http', 'partner', function ($scope, $http, partner) {
-        $scope.paymentInfo = partner.data;
-        $scope.qrConfig = {currency: 'AUD'};
-        $scope.reloadQRCode = function () {
-            $http.get('/client/partner_info/qrcode', {params: $scope.qrConfig}).then(function (resp) {
-                $scope.qrcode = resp.data;
-            });
-        };
-        $scope.reloadQRCode();
-    }]);
     app.controller('clientParameterCtrl', ['$scope', '$http', 'commonDialog', 'timezone', function ($scope, $http, commonDialog, timezone) {
         $scope.getClientConfig = function () {
             $http.get('/client/partner_info').then(function (resp) {

From 09db19f7eeb74e2e56987e4c554676be75fe5b20 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 1 Apr 2019 16:13:22 +0800
Subject: [PATCH 37/38] tmp commit

---
 src/main/ui/manage.html                          | 2 +-
 src/main/ui/static/menu/templates/main_menu.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index b151003f5..38d1a8ee3 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -474,7 +474,7 @@ margin-bottom: 10%;"/>
                         </li>
                         <li ui-sref-active="active">
                             <a ui-sref="surcharge_account_month">
-                                <i class="fa fa-bell"></i> <span>手续费账户月度统计</span>
+                                <i class="fa fa-bell"></i> <span>后付费收款</span>
                             </a>
                         </li>
                         <li ui-sref-active="active">
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index ae2eb3c27..cccf149df 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -339,7 +339,7 @@
                       <div class="description-block">
                           <img src="/static/images/main_menu/compliance_warning.png"/>
                           <div class="description-text">
-                              <span>手续费账户月度统计</span>
+                              <span>后付费收款</span>
                           </div>
                       </div>
                   </a>

From 0296a6936b68b7371e06f3558357805632b0d683 Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Mon, 1 Apr 2019 16:59:36 +0800
Subject: [PATCH 38/38] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=91=E9=80=81=E6=B8=85=E7=AE=97=E5=91=A8?=
 =?UTF-8?q?=E6=9C=9F=E5=8F=98=E6=9B=B4=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/document/cn/apis.js                       |  2 +-
 .../core/impl/RiskBusinessServiceImpl.java    |  1 +
 .../templates/mail/risk_upload_mail.html      |  4 ++--
 src/main/ui/static/analysis/risk_business.js  |  8 ++++++++
 .../analysis/templates/new_riskEvent.html     | 10 ++++++++++
 .../analysis/templates/riskEvent_detail.html  | 19 +++++++++++++++++++
 6 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/document/cn/apis.js b/src/document/cn/apis.js
index ff0a01a93..5fbbf7c6e 100644
--- a/src/document/cn/apis.js
+++ b/src/document/cn/apis.js
@@ -878,7 +878,7 @@
  *
  */
 /**
- * @api {PUT} /api/v1.0/customs/partners/{partner_code}/declare/query/{client_report_id} 创建报关单
+ * @api {PUT} /api/v1.0/customs/partners/{partner_code}/declare/report/{client_report_id} 创建报关单
  * @apiName declare_report
  * @apiDescription
  * 用于商户提交海关需要的订单附件信息。仅支持微信和支付宝，微信只支持一个月内的支付订单进行报关申请。
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 49aae675f..afa0681c9 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
@@ -787,6 +787,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         ctx.setVariable("warning_order_type", event.getIntValue("warning_order_type"));
         ctx.setVariable("description", event.getString("description"));
         ctx.setVariable("is_send_client",event.getIntValue("is_send_client"));
+        ctx.setVariable("send_clean_days",event.getIntValue("send_clean_days"));
         ctx.setVariable("mail_template",event.get("mail_template")==null?0:event.getIntValue("mail_template"));
         String realOrderIdsStr = event.getString("real_order_ids");
         String[] realOrderIds = {};
diff --git a/src/main/resources/templates/mail/risk_upload_mail.html b/src/main/resources/templates/mail/risk_upload_mail.html
index 9fb8b01fa..7fb29931e 100644
--- a/src/main/resources/templates/mail/risk_upload_mail.html
+++ b/src/main/resources/templates/mail/risk_upload_mail.html
@@ -79,8 +79,8 @@
     <p th:if="${refuse_description != null}">
         拒绝理由：<span th:text="${refuse_description}" style="background-color: yellow"></span>。
     </p>
-    <p>近期由于我们的风控系统检测到您的交易异常<span th:if="${royalpay_order_type==1}">，已暂时将您的清算周期调整为T+<span th:text="${client.clean_days}"></span></span>，还请您提供以下材料，还原附件中列明的交易的真实背景：<br>
-        RoyalPay's risk management system recently has identified abnormal transactions from your records<span th:if="${royalpay_order_type==1}">, clean days has been adjusted to T+<span th:text="${client.clean_days}"></span></span>.so please provide us with following materials to assist in verifying the real scenario of the transactions attached:</p>
+    <p>近期由于我们的风控系统检测到您的交易异常<span th:if="${royalpay_order_type==1 and send_clean_days==1}">，已暂时将您的清算周期调整为T+<span th:text="${client.clean_days}"></span></span>，还请您提供以下材料，还原附件中列明的交易的真实背景：<br>
+        RoyalPay's risk management system recently has identified abnormal transactions from your records<span th:if="${royalpay_order_type==1 and send_clean_days==1}">, clean days has been adjusted to T+<span th:text="${client.clean_days}"></span></span>.so please provide us with following materials to assist in verifying the real scenario of the transactions attached:</p>
     <p>1.请解释相应的消费场景/业务模式，例如网站商城，扫码支付， 消费者到店支付等；<br>
         &nbsp;&nbsp;Please explain the relative payment scenario/business activities, for example, online store, QR code payment, payment at the store, etc;</p>
     <p>2.提供相应购物清单，订单小票（请提供与被查交易订单号相匹配的交易时间及金额的发票）；<br> 
diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js
index 8e3c51f49..b00d75ed3 100644
--- a/src/main/ui/static/analysis/risk_business.js
+++ b/src/main/ui/static/analysis/risk_business.js
@@ -282,6 +282,8 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                 $scope.channelResults = channelResultArray;
                 if (riskEvent.data.is_send_client == 1)
                     riskEvent.data.is_send_client = true;
+                if (riskEvent.data.send_clean_days == 1)
+                    riskEvent.data.send_clean_days = true;
                 $scope.riskEvent = riskEvent.data;
 
                 $scope.checkTemplate = function () {
@@ -759,6 +761,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                 $scope.changeIsSendClient = function (flag) {
                     $scope.is_send_client = flag
                 };
+                $scope.send_clean_days = false;
+                $scope.changeIsSendClient = function (flag) {
+                    $scope.send_clean_days = flag
+                };
                 $scope.save = function (form) {
                     if (form.$invalid) {
                         angular.forEach(form, function (item, key) {
@@ -785,6 +791,8 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
 
                     $scope.riskEvent.is_send_client = $scope.is_send_client;
 
+                    $scope.riskEvent.send_clean_days = $scope.send_clean_days;
+
                     var saveRiskBtn = document.getElementById('save-risk-btn');
                     var saveRiskBtnInnerHtmlBak = saveRiskBtn.innerHTML;
                     saveRiskBtn.disabled = true;
diff --git a/src/main/ui/static/analysis/templates/new_riskEvent.html b/src/main/ui/static/analysis/templates/new_riskEvent.html
index f0a64110f..629c2ed5c 100644
--- a/src/main/ui/static/analysis/templates/new_riskEvent.html
+++ b/src/main/ui/static/analysis/templates/new_riskEvent.html
@@ -1,3 +1,4 @@
+
 <section class="content-header">
     <h1>New RiskEvent</h1>
 </section>
@@ -55,6 +56,15 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="form-group" ng-if="riskEvent.order_type ==3 && riskEvent.royalpay_order_type==1">
+                                <label class="control-label col-sm-2">是否发送清算周期变更</label>
+                                <div class="col-xs-6">
+                                    <input type="checkbox"
+                                           ng-model="send_clean_days"
+                                           ng-change="changeSendCleanDays(send_clean_days)"
+                                           bs-switch>
+                                </div>
+                            </div>
                             <div class="form-group"
                                  ng-if="riskEvent.order_type == 4"
                                  ng-class="{'has-error':riskEventForm.warning_order_type.$invalid && riskEventForm.warning_order_type.$dirty}">
diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html
index b87da2879..7dfd94f46 100644
--- a/src/main/ui/static/analysis/templates/riskEvent_detail.html
+++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html
@@ -175,6 +175,16 @@
                                                     </div>
                                                 </div>
 
+                                                <div class="form-group" ng-if="riskEvent.order_type ==3 && riskEvent.royalpay_order_type==1">
+                                                    <label class="control-label col-sm-2">是否发送清算周期变更</label>
+                                                    <div class="col-xs-6">
+                                                        <input type="checkbox"
+                                                               bs-switch
+                                                               switch-readonly="true"
+                                                               ng-model="riskEvent.send_clean_days">
+                                                    </div>
+                                                </div>
+
                                                 <div ng-if="clientInfo != null">
                                                     <div class="form-group" ng-if="riskEvent.result_type <= 2">
                                                         <label class="control-label col-sm-2">Operaction</label>
@@ -569,6 +579,15 @@
                                                 </div>
                                             </div>
 
+                                            <div class="form-group" ng-if="riskEvent.order_type ==3 && riskEvent.royalpay_order_type==1">
+                                                <label class="control-label col-sm-2">是否发送清算周期变更</label>
+                                                <div class="col-xs-6">
+                                                    <input type="checkbox"
+                                                           bs-switch
+                                                           ng-model="riskEventEdit.send_clean_days">
+                                                </div>
+                                            </div>
+
                                             <div class="form-group">
                                                 <label class="control-label col-sm-2"
                                                        for="channel-result-input">Channel Handle Result