From 2367e27ed8c2a47d00bd28f389bf05923c8264f5 Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Tue, 20 Aug 2019 17:21:34 +0800 Subject: [PATCH] =?UTF-8?q?AlphaPayUS=20=E8=B4=A6=E6=88=B7=E5=88=9B?= =?UTF-8?q?=E5=BB=BAbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/ClientComplianceCompanyMapper.java | 8 + .../mappers/system/ClientFilesMapper.java | 4 + .../beans/ClientComplianceQuery.java | 77 ++++++ .../merchants/core/ClientComplianceApply.java | 21 ++ .../manage/merchants/core/ClientManager.java | 2 + .../core/impls/ClientComplianceApplyImpl.java | 124 +++++++++ .../core/impls/ClientManagerImpl.java | 17 ++ .../merchants/web/PartnerApplyController.java | 44 +++ .../core/impls/SignInAccountServiceImpl.java | 2 +- .../system/ClientComplianceCompanyMapper.xml | 9 + .../ui/static/menu/templates/main_menu.html | 2 +- .../static/payment/partner/partner-apply.js | 52 +++- .../templates/client_compliance_to_auth.html | 107 ++++++++ .../client_compliance_to_prefect.html | 30 +- .../partner/templates/partner_auth_files.html | 46 ++-- .../templates/partner_compliance_detail.html | 256 ++++++++++++++++++ .../partner_compliance_for_client.html | 85 ++++++ 17 files changed, 841 insertions(+), 45 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientComplianceQuery.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientComplianceApply.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientComplianceApplyImpl.java create mode 100644 src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.xml create mode 100644 src/main/ui/static/payment/partner/templates/client_compliance_to_auth.html create mode 100644 src/main/ui/static/payment/partner/templates/partner_compliance_detail.html create mode 100644 src/main/ui/static/sys/templates/partner_compliance_for_client.html diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.java index b49860c89..f0c7ba1b5 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.java @@ -5,6 +5,8 @@ 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 com.github.miemiedev.mybatis.paginator.domain.PageBounds; +import com.github.miemiedev.mybatis.paginator.domain.PageList; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -22,4 +24,10 @@ public interface ClientComplianceCompanyMapper { @AutoSql(type = SqlType.SELECT) JSONObject findFileByClientId(@Param("client_id") int client_id); + + PageList listClientCompliances(JSONObject params, PageBounds pageBounds); + + void passComplianceFiles(JSONObject pass); + + void refuseComplianceFiles(JSONObject pass); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.java index 00d891f17..c875167c2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientFilesMapper.java @@ -43,4 +43,8 @@ public interface ClientFilesMapper { void updateBeforeCompliance(@Param("client_id") int client_id); + void passComplianceFiles(@Param("client_id") int client_id); + + void refuseComplianceFiles(@Param("client_id") int client_id); + } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientComplianceQuery.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientComplianceQuery.java new file mode 100644 index 000000000..b18014815 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientComplianceQuery.java @@ -0,0 +1,77 @@ +package au.com.royalpay.payment.manage.merchants.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; + + +/** + * Created by yixian on 2016-07-01. + */ +public class ClientComplianceQuery { + + private int limit = 10; + private int page = 1; + private String status; + private String client_order_id; + private String client_moniker; + + public JSONObject toJson(){ + JSONObject jason = new JSONObject(); + if(StringUtils.isNotEmpty(status)){ + jason.put("status",status); + } + if(StringUtils.isNotEmpty(client_order_id)){ + jason.put("client_order_id",client_order_id); + } + if(StringUtils.isNotEmpty(client_moniker)){ + jason.put("client_moniker",client_moniker); + } + return jason; + } + + public int getLimit() { + return limit; + } + + public void setLimit(int limit) { + this.limit = limit; + } + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getClient_order_id() { + return client_order_id; + } + + public void setClient_order_id(String client_order_id) { + this.client_order_id = client_order_id; + } + + public String getClient_moniker() { + return client_moniker; + } + + public void setClient_moniker(String client_moniker) { + this.client_moniker = client_moniker; + } +} diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientComplianceApply.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientComplianceApply.java new file mode 100644 index 000000000..ec1c61a0d --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientComplianceApply.java @@ -0,0 +1,21 @@ +package au.com.royalpay.payment.manage.merchants.core; + +import au.com.royalpay.payment.manage.merchants.beans.ClientApplyInfo; +import au.com.royalpay.payment.manage.merchants.beans.ClientComplianceQuery; +import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery; +import com.alibaba.fastjson.JSONObject; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + + +/** + * Created by yishuqian on 18/10/2016. + */ +public interface ClientComplianceApply { + JSONObject listClientComplianceApply(JSONObject manager, ClientComplianceQuery apply); + void passComplianceFiles(JSONObject manager,JSONObject passInfo); + void refuseComplianceFiles(JSONObject manager,JSONObject refuseInfo); + JSONObject complianceAuthFile(JSONObject client); + +} 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 2ebae1c8f..735debc3c 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 @@ -462,4 +462,6 @@ public interface ClientManager { void updateRefundCreditLine(JSONObject manager, String clientMoniker, JSONObject refundLineInfo); JSONObject getComplianceFiles(JSONObject account); + + JSONObject getComplianceFilesForBD(JSONObject account); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientComplianceApplyImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientComplianceApplyImpl.java new file mode 100644 index 000000000..c9146e70d --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientComplianceApplyImpl.java @@ -0,0 +1,124 @@ +package au.com.royalpay.payment.manage.merchants.core.impls; + + +import au.com.royalpay.payment.core.exceptions.InvalidShortIdException; +import au.com.royalpay.payment.manage.mappers.system.*; +import au.com.royalpay.payment.manage.merchants.beans.ClientApplyInfo; +import au.com.royalpay.payment.manage.merchants.beans.ClientComplianceQuery; +import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery; +import au.com.royalpay.payment.manage.merchants.core.ClientApply; +import au.com.royalpay.payment.manage.merchants.core.ClientComplianceApply; +import au.com.royalpay.payment.manage.merchants.core.ClientConfigService; +import au.com.royalpay.payment.manage.merchants.core.ClientModifySupport; +import au.com.royalpay.payment.manage.merchants.entity.impls.SourceModify; +import au.com.royalpay.payment.manage.merchants.events.ClientApplyEvent; +import au.com.royalpay.payment.manage.merchants.events.ClientApplyNotifyBDEvent; +import au.com.royalpay.payment.tools.exceptions.BadRequestException; +import au.com.royalpay.payment.tools.exceptions.ForbiddenException; +import au.com.royalpay.payment.tools.exceptions.NotFoundException; +import au.com.royalpay.payment.tools.permission.enums.ManagerRole; +import au.com.royalpay.payment.tools.utils.PageListUtils; +import com.alibaba.fastjson.JSONObject; +import com.github.miemiedev.mybatis.paginator.domain.Order; +import com.github.miemiedev.mybatis.paginator.domain.PageBounds; +import com.github.miemiedev.mybatis.paginator.domain.PageList; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.poi.hssf.usermodel.HSSFCellStyle; +import org.apache.poi.hssf.usermodel.HSSFFont; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.hssf.util.HSSFColor; +import org.apache.poi.ss.usermodel.*; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.context.ApplicationEventPublisherAware; +import org.springframework.data.redis.core.BoundValueOperations; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.Assert; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.OutputStream; +import java.util.Date; +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +/** + * Created by yishuqian on 18/10/2016. + */ +@Service +public class ClientComplianceApplyImpl implements ClientComplianceApply +{ + @Resource + private ClientComplianceCompanyMapper clientComplianceCompanyMapper; + @Resource + private ClientFilesMapper clientFilesMapper; + + @Override + public JSONObject listClientComplianceApply(JSONObject manager, ClientComplianceQuery applyQuery) { + JSONObject params = applyQuery.toJson(); + if (ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) { + params.put("bd_user", manager.getString("manager_id")); + } + PageList partners = clientComplianceCompanyMapper.listClientCompliances(params, new PageBounds(applyQuery.getPage(), applyQuery.getLimit(), Order.formString("create_time.desc"))); + return PageListUtils.buildPageListResult(partners); + } + + + @Override + public void passComplianceFiles(JSONObject manager, JSONObject passInfo) { + JSONObject pass = new JSONObject(); + pass.put("operator_id", manager.getString("manager_id")); + pass.put("client_id",passInfo.getIntValue("client_id")); + clientComplianceCompanyMapper.passComplianceFiles(pass); + clientFilesMapper.passComplianceFiles(passInfo.getIntValue("client_id")); + } + + @Override + public void refuseComplianceFiles(JSONObject manager, JSONObject refuseInfo) { + JSONObject refuse = new JSONObject(); + refuse.put("operator_id", manager.getString("manager_id")); + refuse.put("client_id",refuseInfo.getIntValue("client_id")); + refuse.put("description",refuseInfo.getIntValue("description")); + clientComplianceCompanyMapper.refuseComplianceFiles(refuse); + clientFilesMapper.refuseComplianceFiles(refuseInfo.getIntValue("client_id")); + + } + + + + @Override + public JSONObject complianceAuthFile(JSONObject client) + { + String[] fileKeys = {"client_bank_file", "client_company_file", "client_id_file", "client_agree_file", "client_apply_file"}; + if (client == null) { + throw new InvalidShortIdException(); + } + List clientFiles = clientFilesMapper.findAllClientFile(client.getIntValue("client_id")); + JSONObject fileJson = new JSONObject(); + if (clientFiles != null && clientFiles.size() > 0) { + for (String fileKey : fileKeys) { + List clientFileUrl = clientFiles.stream() + .filter(json -> (fileKey.equals(json.getString("file_name")))) + .sorted((log1, log2) -> log2.getDate("last_update_date").compareTo(log1.getDate("last_update_date"))) + .map(json -> { + JSONObject params = new JSONObject(); + params.put("file_id", json.getString("file_id")); + params.put("status", json.getString("status")); + params.put("file_value", json.getString("file_value")); + return params; + }) + .collect(Collectors.toList()); + if (clientFileUrl != null && clientFileUrl.size() > 0) { + fileJson.put(fileKey, clientFileUrl); + } + } + } + return fileJson; + + }; +} 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 774e68870..b3feb38c7 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 @@ -158,6 +158,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid private AttachmentClient attachmentClient; @Resource private StringRedisTemplate stringRedisTemplate; + @Resource + private ClientComplianceApply clientComplianceApply; + @Value("${app.redis.prefix}") private String redisPrefix; private ApplicationEventPublisher publisher; @@ -1998,6 +2001,20 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid return file; } + @Override + public JSONObject getComplianceFilesForBD(JSONObject account) + { + JSONObject client = getClientInfo(account.getIntValue("client_id")); + if (client == null) { + throw new InvalidShortIdException(); + } + + JSONObject file = clientComplianceApply.complianceAuthFile(client); + file.put("file_company",clientComplianceCompanyMapper.findFileByClientId(account.getIntValue("client_id"))); + file.put("client",client); + return file; + } + @Override @Transactional public void updateClientBDUsers(JSONObject manager, String clientMoniker, JSONObject data) throws Exception { diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerApplyController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerApplyController.java index cf33bad9b..423c8db03 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerApplyController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerApplyController.java @@ -1,5 +1,9 @@ package au.com.royalpay.payment.manage.merchants.web; +import au.com.royalpay.payment.manage.mappers.system.ClientComplianceCompanyMapper; +import au.com.royalpay.payment.manage.merchants.beans.ClientComplianceQuery; +import au.com.royalpay.payment.manage.merchants.core.ClientComplianceApply; +import au.com.royalpay.payment.manage.merchants.core.ClientManager; import com.google.code.kaptcha.Producer; import au.com.royalpay.payment.manage.merchants.beans.ClientApplyInfo; @@ -40,6 +44,13 @@ public class PartnerApplyController { private ClientApply clientApply; @Resource private Producer captchaProducer; + @Resource + private ClientComplianceCompanyMapper clientComplianceCompanyMapper; + @Resource + private ClientComplianceApply clientComplianceApply; + @Resource + private ClientManager clientManager; + @RequestMapping(method = RequestMethod.POST) public void applyPartner(@CookieValue(CommonConsts.CODE_KEY) String codeKey, @RequestBody @Valid ClientApplyInfo apply, @@ -67,6 +78,39 @@ public class PartnerApplyController { return clientApply.listPartnerApply(manager,apply); } + @RequestMapping(value = "/listClientCompliances",method = RequestMethod.GET) + @RequireManager(role = {ManagerRole.ADMIN, ManagerRole.BD_USER, ManagerRole.OPERATOR, ManagerRole.SERVANT}) + public JSONObject clientComplianceList(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, ClientComplianceQuery apply) { + /*return clientApply.listPartnerApply(manager,apply);*/ + return clientComplianceApply.listClientComplianceApply(manager,apply); + } + + @RequestMapping(value = "/pass/complianceFiles",method = RequestMethod.GET) + @RequireManager(role = {ManagerRole.ADMIN, ManagerRole.BD_USER, ManagerRole.OPERATOR, ManagerRole.SERVANT}) + public void passCompliances(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, JSONObject passInfo) { + clientComplianceApply.passComplianceFiles(manager,passInfo); + } + + @RequestMapping(value = "/refuse/complianceFiles",method = RequestMethod.GET) + @RequireManager(role = {ManagerRole.ADMIN, ManagerRole.BD_USER, ManagerRole.OPERATOR, ManagerRole.SERVANT}) + public void refuseCompliances(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, JSONObject refuseInfo) { + clientComplianceApply.passComplianceFiles(manager,refuseInfo); + } + + @RequestMapping(value = "/compliance/clientViewFiles/{client_id}",method = RequestMethod.GET) + @RequireManager(role = {ManagerRole.ADMIN, ManagerRole.BD_USER, ManagerRole.OPERATOR, ManagerRole.SERVANT}) + public JSONObject searchCompliances(@PathVariable int client_id) { + JSONObject clientId = new JSONObject(); + clientId.put("client_id",client_id); + return clientManager.getComplianceFilesForBD(clientId); + } + + @RequestMapping(value = "/{client_id}",method = RequestMethod.GET) + @RequireManager(role = {ManagerRole.ADMIN, ManagerRole.BD_USER, ManagerRole.OPERATOR, ManagerRole.SERVANT}) + public JSONObject getComplianceCompanyDetail(@PathVariable String client_apply_id) { + return clientApply.getPartnerApplicationDetail(client_apply_id); + } + @RequestMapping(value = "/{client_apply_id}",method = RequestMethod.GET) @RequireManager(role = {ManagerRole.ADMIN, ManagerRole.BD_USER, ManagerRole.OPERATOR, ManagerRole.SERVANT}) public JSONObject getApplicationDetail(@PathVariable String client_apply_id) { 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 024d0f104..ea362263b 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 @@ -693,7 +693,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati return result; } - + @Override public JSONObject checkAuthFileStatus(JSONObject client) { JSONObject result = new JSONObject(); result.put("client_less_file", false); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.xml new file mode 100644 index 000000000..75cfe2686 --- /dev/null +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index e806ef1f6..13b5961a8 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -407,7 +407,7 @@
- +
diff --git a/src/main/ui/static/payment/partner/partner-apply.js b/src/main/ui/static/payment/partner/partner-apply.js index c936abe44..36b091d4c 100644 --- a/src/main/ui/static/payment/partner/partner-apply.js +++ b/src/main/ui/static/payment/partner/partner-apply.js @@ -6,6 +6,10 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS url: '/partner/apply', templateUrl: '/static/payment/partner/templates/partners_apply.html', controller: 'partnerApplyCtrl' + }).state('partner_compliance_auth', { + url: '/partners/complianceForClient', + templateUrl: 'static/sys/templates/partner_compliance_for_client.html', + controller: 'compliancePartnerForClientCtrl' }).state('partner_apply.partner_application', { url: '/application', templateUrl: '/static/payment/partner/templates/partner_application.html', @@ -19,8 +23,36 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS return $http.get('/partners/application/' + $stateParams.client_apply_id); }] } + }).state('partner_apply.compliance_detail', { + url: '/{client_id}/compliance_detail', + templateUrl: '/static/payment/partner/templates/client_compliance_to_auth.html', + controller: 'partnerComplianceCompanyDetail', + resolve: { + file: ['$http','$stateParams',function ($http, $stateParams) { + return $http.get('/partners/application/compliance/clientViewFiles/'+ $stateParams.client_id); + }] + } }) }]); + + app.controller('compliancePartnerForClientCtrl', ['$scope', '$sce', '$http', '$filter', '$uibModal', 'businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap', + function ($scope, $sce, $http, $filter, $uibModal, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) { + $scope.pagination = {}; + $scope.industries = industryMap.configs() + $scope.states = stateMap.configs(); + $scope.countries = countryMap.configs(); + $scope.params = {}; + $scope.loadClientCompliance = function (page) { + var params = angular.copy($scope.params); + params.page = page || $scope.pagination.page || 1; + $http.get('/partners/application/listClientCompliances', {params: params}).then(function (resp) { + debugger; + $scope.compliances = resp.data.data; + $scope.pagination = resp.data.pagination; + }); + }; + $scope.loadClientCompliance(1); + }]); app.controller('partnerApplyCtrl', ['$rootScope','$state', function ($rootScope,$state) { if ($state.is('partner_apply')){ $state.go('.partner_application'); @@ -163,6 +195,24 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS } }]); + + app.controller('partnerComplianceCompanyDetail', ['$rootScope', '$scope', '$http', '$state', '$uibModal', 'commonDialog', 'file', function ($rootScope, $scope, $http, $state, $uibModal, commonDialog, file) { + debugger; + $scope.file = file.data || {}; + $scope.filesrc = $scope.file.client_bank_file; + + /*未完成*/ + $scope.passPartnerComplianceFiles = function () { + $http.put('partners/application/unregister_accounts/' + $scope.account.account_id, $scope.account).then(function (resp) { + $scope.$close(); + }, function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); + }) + } + + }]); + + app.controller('passApplicationCtrl', ['$scope', '$http', '$state', 'partner', function ($scope, $http, $state, partner) { $scope.partner = angular.copy(partner); $scope.submit = function (form) { @@ -226,4 +276,4 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS }; }); return app; -}); \ No newline at end of file +}); diff --git a/src/main/ui/static/payment/partner/templates/client_compliance_to_auth.html b/src/main/ui/static/payment/partner/templates/client_compliance_to_auth.html new file mode 100644 index 000000000..be570aef6 --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/client_compliance_to_auth.html @@ -0,0 +1,107 @@ + +
+
Audit Files     + + +

+
+
+
+
+ +
+ + + + + + + + + + +
1 + + + +
+ + +
+ +
+ +
+ +
+ + + + + + + +
1 + + + +
+
+ +
+ + +
+ +
+ + + + + + + +
1 + + + +
+
+ +
+ +
+
+ +
+ + + + + + +
1 + + + +
+
+ +
+
+ +
+
+
+ + + + diff --git a/src/main/ui/static/payment/partner/templates/client_compliance_to_prefect.html b/src/main/ui/static/payment/partner/templates/client_compliance_to_prefect.html index 94f39a4fd..6ceca3780 100644 --- a/src/main/ui/static/payment/partner/templates/client_compliance_to_prefect.html +++ b/src/main/ui/static/payment/partner/templates/client_compliance_to_prefect.html @@ -34,12 +34,11 @@ - + - @@ -73,12 +72,11 @@ -->
11 - - - + + +
- + -
11 - - + +
@@ -118,12 +116,11 @@ - + -
11 - - + +
@@ -164,12 +161,11 @@ - + -
11 - - + +
diff --git a/src/main/ui/static/payment/partner/templates/partner_auth_files.html b/src/main/ui/static/payment/partner/templates/partner_auth_files.html index 4b45755fe..5ad9be5c5 100644 --- a/src/main/ui/static/payment/partner/templates/partner_auth_files.html +++ b/src/main/ui/static/payment/partner/templates/partner_auth_files.html @@ -33,12 +33,12 @@ - + - @@ -71,12 +71,11 @@ -->
11 - - - + + + +
- + -
11 - - - + + +
@@ -115,12 +114,11 @@ - + -
11 - - - + + +
@@ -160,12 +158,11 @@ - + -
11 - - - + + +
@@ -198,12 +195,11 @@ - + -
11 - - - + + +
diff --git a/src/main/ui/static/payment/partner/templates/partner_compliance_detail.html b/src/main/ui/static/payment/partner/templates/partner_compliance_detail.html new file mode 100644 index 000000000..c4b48361a --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/partner_compliance_detail.html @@ -0,0 +1,256 @@ +
+

+ +

+
+ +
+
+
+
+
+
+
+ Partner Basic Information + (Refused) + (Pass) + + ({{partner.bd_user_name}} is following) +
+
+ + {{$select.selected.display_name}} + +
+ + +
+ + +
+ + + + + + + + + + + +
+ + Refuse + +
+
+
+ + {{$select.selected.display_name}} + +
+ + +
+ + +
+
+ + PASS + +
+ +
+
+
+
+ + +
+

+
+
+
+ + +
+

+
+
+
+ + +
+

+
+
+ + + + + + + + + + + + + + +
+ + +
+ +
+
+
+ + +
+

+
+
+ + + + + + + + + + + + + + +
+ + +
+

+
+
+
+ + +
+

+
+
+
+ + +
+

+
+
+
+ + +
+

+
+
+
+ + +
+

+
+
+
+ + +
+

+
+
+
+ + +
+

+
+
+ +
+
+
+ +
+
Contact Information
+
+
+
+ + +
+

+
+
+ + + + + + + +
+ + +
+

+
+
+
+ + +
+

+
+
+
+
+
+ +
+
Approaching Progress
+
+
+
+
+ + Save +
+
+

+
+
+ +
+
+
+
+
+ +
+
+
diff --git a/src/main/ui/static/sys/templates/partner_compliance_for_client.html b/src/main/ui/static/sys/templates/partner_compliance_for_client.html new file mode 100644 index 000000000..a85d897fb --- /dev/null +++ b/src/main/ui/static/sys/templates/partner_compliance_for_client.html @@ -0,0 +1,85 @@ +
+

商户合规文件审核

+
    +
  1. + Compliance Management +
    2. +
  2. 商户合规文件审核
    3. +
+
+ +
+
+
+
+ + +
+ +
+ +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
Client MonikerCompliance IdCreate TimeCompliance StatusOperator IdRefuse ReasonOperation
Detail +
+
+ +
+ +
+ +
+ +