From 6ca6628c12e78d46b0b71ed78d2c17f7d3e4b83f Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Wed, 27 Jun 2018 15:35:23 +0800 Subject: [PATCH] fix apply --- src/db/modify.sql | 16 +- .../application/beans/AddHandleLogDetail.java | 34 ++ .../beans/ClientApplyQueryBean.java | 12 + .../application/beans/HandleLogQuery.java | 42 ++ .../core/SimpleClientApplyManageService.java | 8 + .../SimpleClientApplyManageServiceImpl.java | 60 +++ .../web/SimpleClientManageController.java | 17 + .../preapply/PreApplyHandleLogMapper.java | 23 ++ src/main/ui/manage.html | 6 +- .../static/payment/partner/partner-apply.js | 130 ++++++- .../partner/templates/add_handle_log.html | 25 ++ .../templates/partner_application.html | 106 +++++ .../templates/partner_application_detail.html | 7 - .../templates/partners_applications.html | 133 ------- .../partner/templates/partners_apply.html | 41 ++ .../templates/simple_application_detail.html | 367 +++++++++++++++--- .../templates/simple_applications.html | 31 +- 17 files changed, 845 insertions(+), 213 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/application/beans/AddHandleLogDetail.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/application/beans/HandleLogQuery.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/mappers/preapply/PreApplyHandleLogMapper.java create mode 100644 src/main/ui/static/payment/partner/templates/add_handle_log.html create mode 100644 src/main/ui/static/payment/partner/templates/partner_application.html delete mode 100644 src/main/ui/static/payment/partner/templates/partners_applications.html create mode 100644 src/main/ui/static/payment/partner/templates/partners_apply.html diff --git a/src/db/modify.sql b/src/db/modify.sql index b2e1be0e5..c4461a130 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -580,4 +580,18 @@ update log_clearing_detail set settle_bank='CBA'; ALTER TABLE `log_clearing` -ADD COLUMN `editable` tinyint(1) NULL DEFAULT 1 COMMENT '是否可编辑' AFTER `balance`; \ No newline at end of file +ADD COLUMN `editable` tinyint(1) NULL DEFAULT 1 COMMENT '是否可编辑' AFTER `balance`; + + +CREATE TABLE `pre_apply_handle_log` ( + `id` varchar(50) NOT NULL, + `client_pre_apply_id` int(11) NOT NULL, + `client_id` int(11) NOT NULL, + `auditor` varchar(30) NOT NULL, + `auditor_id` varchar(50) NOT NULL, + `remark` varchar(100) DEFAULT NULL, + `create_time` datetime NOT NULL, + PRIMARY KEY (`id`), + KEY `client_id` (`client_id`) USING BTREE, + KEY `client_pre_apply_id` (`client_pre_apply_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file diff --git a/src/main/java/au/com/royalpay/payment/manage/application/beans/AddHandleLogDetail.java b/src/main/java/au/com/royalpay/payment/manage/application/beans/AddHandleLogDetail.java new file mode 100644 index 000000000..3c86497c9 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/application/beans/AddHandleLogDetail.java @@ -0,0 +1,34 @@ +package au.com.royalpay.payment.manage.application.beans; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; + +/** + * Created by yuan on 2018/6/27. + */ +public class AddHandleLogDetail { + private String client_pre_apply_id; + + private String remark; + + public JSONObject insertObject() { + JSONObject res = (JSONObject) JSON.toJSON(this); + return res; + } + + public String getClient_pre_apply_id() { + return client_pre_apply_id; + } + + public void setClient_pre_apply_id(String client_pre_apply_id) { + this.client_pre_apply_id = client_pre_apply_id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } +} diff --git a/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientApplyQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientApplyQueryBean.java index fe125e02b..520c9dfe3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientApplyQueryBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientApplyQueryBean.java @@ -11,12 +11,16 @@ public class ClientApplyQueryBean { private int page = 1; private int limit = 10; private String agree; + private String status; public JSONObject insertObject() { JSONObject params = new JSONObject(); if(StringUtils.isNotEmpty(agree)){ params.put("agree",agree); } + if(StringUtils.isNotEmpty(status)){ + params.put("status",status); + } return params; } @@ -43,4 +47,12 @@ public class ClientApplyQueryBean { public void setAgree(String agree) { this.agree = agree; } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/application/beans/HandleLogQuery.java b/src/main/java/au/com/royalpay/payment/manage/application/beans/HandleLogQuery.java new file mode 100644 index 000000000..b3b049f63 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/application/beans/HandleLogQuery.java @@ -0,0 +1,42 @@ +package au.com.royalpay.payment.manage.application.beans; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; + +/** + * Created by yuan on 2018/6/27. + */ +public class HandleLogQuery { + private int page = 1; + private int limit = 10; + private String client_pre_apply_id; + + public JSONObject insertObject() { + JSONObject res = (JSONObject) JSON.toJSON(this); + return res; + } + + 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 String getClient_pre_apply_id() { + return client_pre_apply_id; + } + + public void setClient_pre_apply_id(String client_pre_apply_id) { + this.client_pre_apply_id = client_pre_apply_id; + } +} diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyManageService.java b/src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyManageService.java index e86ebe66b..62ad51225 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyManageService.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyManageService.java @@ -1,6 +1,8 @@ package au.com.royalpay.payment.manage.application.core; +import au.com.royalpay.payment.manage.application.beans.AddHandleLogDetail; import au.com.royalpay.payment.manage.application.beans.ClientApplyQueryBean; +import au.com.royalpay.payment.manage.application.beans.HandleLogQuery; import com.alibaba.fastjson.JSONObject; /** @@ -10,4 +12,10 @@ public interface SimpleClientApplyManageService { JSONObject listsApplies(JSONObject manager,ClientApplyQueryBean clientApplyQueryBean); JSONObject findOneApply(JSONObject manager,String client_pre_apply_id); + + JSONObject listAllHandleLogs(JSONObject manager,HandleLogQuery handleLogQuery); + + void addHandleLog(JSONObject manager,AddHandleLogDetail addHandleLogDetail); + + void closeHandle(JSONObject manager,String client_pre_apply_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyManageServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyManageServiceImpl.java index bba7f38df..7b8dc3d10 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyManageServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyManageServiceImpl.java @@ -1,9 +1,13 @@ package au.com.royalpay.payment.manage.application.core.impls; +import au.com.royalpay.payment.manage.application.beans.AddHandleLogDetail; import au.com.royalpay.payment.manage.application.beans.ClientApplyQueryBean; +import au.com.royalpay.payment.manage.application.beans.HandleLogQuery; import au.com.royalpay.payment.manage.application.core.SimpleClientApplyManageService; +import au.com.royalpay.payment.manage.mappers.preapply.PreApplyHandleLogMapper; import au.com.royalpay.payment.manage.mappers.preapply.SysClientPreMapperMapper; import au.com.royalpay.payment.tools.exceptions.BadRequestException; +import au.com.royalpay.payment.tools.exceptions.NotFoundException; import au.com.royalpay.payment.tools.utils.PageListUtils; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; @@ -12,6 +16,7 @@ import com.github.miemiedev.mybatis.paginator.domain.PageList; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; /** * Created by yuan on 2018/6/4. @@ -20,12 +25,16 @@ import javax.annotation.Resource; public class SimpleClientApplyManageServiceImpl implements SimpleClientApplyManageService{ @Resource private SysClientPreMapperMapper sysClientPreMapperMapper; + + @Resource + private PreApplyHandleLogMapper preApplyHandleLogMapper; @Override public JSONObject listsApplies(JSONObject manager, ClientApplyQueryBean clientApplyQueryBean) { if(manager == null){ throw new BadRequestException(); } JSONObject params = clientApplyQueryBean.insertObject(); + PageList applies = sysClientPreMapperMapper.listApplies(params, new PageBounds(clientApplyQueryBean.getPage(), clientApplyQueryBean.getLimit(), Order.formString("create_time.desc"))); return PageListUtils.buildPageListResult(applies); @@ -38,4 +47,55 @@ public class SimpleClientApplyManageServiceImpl implements SimpleClientApplyMan } return sysClientPreMapperMapper.findOneByClientPreApplyId(client_pre_apply_id); } + + @Override + public JSONObject listAllHandleLogs(JSONObject manager, HandleLogQuery handleLogQuery) { + if(manager == null){ + throw new BadRequestException(); + } + JSONObject params = handleLogQuery.insertObject(); + PageList allLogs = preApplyHandleLogMapper.listHandleLogs(params,new PageBounds(handleLogQuery.getPage(),handleLogQuery.getLimit(),Order.formString("create_time.desc"))); + return PageListUtils.buildPageListResult(allLogs); + } + + @Override + public void addHandleLog(JSONObject manager, AddHandleLogDetail addHandleLogDetail) { + if(manager == null){ + throw new BadRequestException(); + } + JSONObject apply = sysClientPreMapperMapper.findOneByClientPreApplyId(addHandleLogDetail.getClient_pre_apply_id()); + if (apply == null) { + throw new NotFoundException("Apply Record Not Found Please Check"); + } + JSONObject detail = addHandleLogDetail.insertObject(); + detail.put("auditor", manager.getString("display_name")); + detail.put("client_id", apply.getIntValue("client_id")); + detail.put("auditor_id", manager.getString("manager_id")); + detail.put("create_time", new Date()); + preApplyHandleLogMapper.save(detail); + apply.put("status",1); + sysClientPreMapperMapper.update(apply); + + } + + @Override + public void closeHandle(JSONObject manager, String client_pre_apply_id) { + JSONObject apply = sysClientPreMapperMapper.findOneByClientPreApplyId(client_pre_apply_id); + if (apply == null) { + throw new NotFoundException("Apply Record Not Found Please Check"); + } + if (apply.getIntValue("status") == 2) { + throw new BadRequestException("The Record Has Been Handled"); + } + JSONObject detail = new JSONObject(); + detail.put("client_pre_apply_id", client_pre_apply_id); + detail.put("client_id", apply.getIntValue("client_id")); + detail.put("auditor", manager.getString("display_name")); + detail.put("auditor_id", manager.getString("manager_id")); + detail.put("remark", "结停"); + detail.put("create_time", new Date()); + preApplyHandleLogMapper.save(detail); + apply.put("status", 2); + sysClientPreMapperMapper.update(apply); + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientManageController.java b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientManageController.java index ad049b8f2..b1d698e57 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientManageController.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientManageController.java @@ -1,6 +1,8 @@ package au.com.royalpay.payment.manage.application.web; +import au.com.royalpay.payment.manage.application.beans.AddHandleLogDetail; import au.com.royalpay.payment.manage.application.beans.ClientApplyQueryBean; +import au.com.royalpay.payment.manage.application.beans.HandleLogQuery; import au.com.royalpay.payment.manage.application.core.SimpleClientApplyManageService; import au.com.royalpay.payment.manage.mappers.preapply.SysClientPreMapperMapper; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; @@ -29,4 +31,19 @@ public class SimpleClientManageController { public JSONObject findOneApply(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String client_pre_apply_id){ return simpleClientApplyManageService.findOneApply(manager,client_pre_apply_id); } + + @ManagerMapping(value = "/log",method = RequestMethod.GET,role = {ManagerRole.ADMIN, ManagerRole.OPERATOR}) + public JSONObject listAllHandleLog(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, HandleLogQuery handleLogQuery){ + return simpleClientApplyManageService.listAllHandleLogs(manager,handleLogQuery); + } + + @ManagerMapping(method = RequestMethod.PUT,role = {ManagerRole.ADMIN, ManagerRole.OPERATOR}) + public void addHandleLog(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @RequestBody AddHandleLogDetail addHandleLogDetail){ + simpleClientApplyManageService.addHandleLog(manager,addHandleLogDetail); + } + + @ManagerMapping(value = "/{client_pre_apply_id}",method = RequestMethod.PUT,role = {ManagerRole.ADMIN, ManagerRole.OPERATOR}) + public void closeHandle(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String client_pre_apply_id){ + simpleClientApplyManageService.closeHandle(manager,client_pre_apply_id); + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/preapply/PreApplyHandleLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/preapply/PreApplyHandleLogMapper.java new file mode 100644 index 000000000..5902e73e2 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/preapply/PreApplyHandleLogMapper.java @@ -0,0 +1,23 @@ +package au.com.royalpay.payment.manage.mappers.preapply; + +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; + +@AutoMapper(tablename = "pre_apply_handle_log", pkName = "id") +public interface PreApplyHandleLogMapper { + @AutoSql(type = SqlType.UPDATE) + void update(JSONObject data); + + @AutoSql(type = SqlType.INSERT) + void save(JSONObject data); + + @AutoSql(type = SqlType.SELECT) + PageList listHandleLogs(JSONObject params, PageBounds pagination); +} diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index ee79f7308..ba2e6f05b 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -237,7 +237,7 @@ margin-bottom: 10%;"/>
  • - + 自主申请|Partner Applies
    • @@ -268,11 +268,11 @@ margin-bottom: 10%;"/> -
  • +
  • diff --git a/src/main/ui/static/payment/partner/partner-apply.js b/src/main/ui/static/payment/partner/partner-apply.js index 95eccd922..3531d7fb7 100644 --- a/src/main/ui/static/payment/partner/partner-apply.js +++ b/src/main/ui/static/payment/partner/partner-apply.js @@ -2,12 +2,15 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS 'use strict'; var app = angular.module('partnerApplyApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch', 'ngFileUpload', 'ui.select']); app.config(['$stateProvider', function ($stateProvider) { - $stateProvider.state('partner_application', { - url: '/partner/applications', - templateUrl: '/static/payment/partner/templates/partners_applications.html', - controller: 'partnerApplicationListCtrl', - data: {label: '商户申请列表'} - }).state('detail', { + $stateProvider.state('partner_apply', { + url: '/partner/apply', + templateUrl: '/static/payment/partner/templates/partners_apply.html', + controller: 'partnerApplyCtrl' + }).state('partner_apply.partner_application', { + url: '/application', + templateUrl: '/static/payment/partner/templates/partner_application.html', + controller: 'partnerApplicationListCtrl' + }).state('partner_apply.detail', { url: '/{client_apply_id}/detail', templateUrl: '/static/payment/partner/templates/partner_application_detail.html', controller: 'partnerApplicationDetailCtrl', @@ -16,22 +19,34 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS return $http.get('/partners/application/' + $stateParams.client_apply_id); }] } - }).state('partner_application.simple_application', { + }).state('partner_apply.simple_application', { url: '/simple/applications', templateUrl: '/static/payment/partner/templates/simple_applications.html', controller: 'simpleApplicationListCtrl', data: {label: '商户自主申请列表'} - }).state('apply_detail', { - url: '/{client_pre_apply_id}/simple/detail', + }).state('partner_apply.apply_detail', { + url: '/{client_pre_apply_id}/{status}/detail', templateUrl: '/static/payment/partner/templates/simple_application_detail.html', controller: 'simpleApplicationDetailCtrl', resolve: { - apply: ['$http', '$stateParams', function ($http, $stateParams) { - return $http.get('/register/manage/getOne/' + $stateParams.client_pre_apply_id); + client_pre_apply_id: ['$stateParams', function ($stateParams) { + return $stateParams.client_pre_apply_id; + }], + status: ['$stateParams', function ($stateParams) { + return $stateParams.status; }] } + }).state('partner_apply.citypartner_reg', { + url: '/citypartner_registries', + templateUrl: '/static/citypartner/templates/citypartner_registers.html', + controller: 'citypartnerRegisterListCtrl' }) }]); + app.controller('partnerApplyCtrl', ['$rootScope','$state', function ($rootScope,$state) { + if ($state.is('partner_apply')){ + $state.go('.partner_application'); + } + }]); app.controller('partnerApplicationListCtrl', ['$scope', '$state', '$http', '$uibModal', 'commonDialog', 'industryMap', 'stateMap','countryMap', function ($scope, $state, $http, $uibModal, commonDialog, industryMap, stateMap,countryMap) { $scope.pagination = {}; @@ -217,7 +232,11 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS function ($scope, $state, $http, $uibModal, commonDialog) { $scope.pagination = {}; $scope.params = {}; - + $scope.removeStatus = function () { + if($scope.params.status){ + delete $scope.params.status; + } + }; $scope.loadSimpleApplies = function (page) { var params = angular.copy($scope.params); params.page = page || $scope.pagination.page || 1; @@ -230,8 +249,91 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS $scope.loadSimpleApplies(1); }]); - app.controller('simpleApplicationDetailCtrl', [ '$scope', '$http', '$state', '$uibModal', 'commonDialog','apply', function ($scope, $http, $state, $uibModal, commonDialog,apply) { - $scope.partner = apply.data; + app.controller('simpleApplicationDetailCtrl', [ '$scope', '$http', '$state', '$uibModal', 'commonDialog','client_pre_apply_id','status', function ($scope, $http, $state, $uibModal, commonDialog,client_pre_apply_id,status) { + $scope.pagination = {}; + if(status == 0 || status ==1){ + $scope.index = 1; + } + $scope.params = {client_pre_apply_id:client_pre_apply_id}; + $scope.loadDetail = function () { + $http.get('/register/manage/getOne/' + client_pre_apply_id).then(function (resp) { + $scope.partner = resp.data; + }); + }; + $scope.loadHandleLogs = function (page) { + var params = angular.copy($scope.params); + params.page = page || $scope.pagination.page || 1; + $http.get('/register/manage/log',{params:params}).then(function (resp) { + $scope.handleLogs = resp.data.data; + $scope.pagination = resp.data.pagination + }); + }; + $scope.loadDetail(1); + $scope.loadHandleLogs(); + + $scope.addHandleLog = function () { + $uibModal.open({ + templateUrl: '/static/payment/partner/templates/add_handle_log.html', + controller: 'addHandleDetailCtrl', + resolve:{ + client_pre_apply_id:function () { + return $scope.partner.client_pre_apply_id; + }} + }).result.then(function () { + $scope.loadHandleLogs(1); + commonDialog.alert({title: 'Success', type: 'success'}); + }) + }; + + $scope.closeHandleLog = function () { + commonDialog.confirm({title: 'Confirm', content: '确定此次处理已结束？' + }).then(function () { + $http.put('/register/manage/'+ client_pre_apply_id).then(function (resp) { + commonDialog.alert({title: 'Success', type: 'Success'}); + $scope.loadHandleLogs(1); + },function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); + }) + }) + } + }]); + + app.controller('addHandleDetailCtrl', [ '$scope', '$http', '$state', 'client_pre_apply_id', 'commonDialog',function ($scope, $http, $state, client_pre_apply_id, commonDialog) { + $scope.handleDetail = {client_pre_apply_id:client_pre_apply_id}; + $scope.addHandleLog = function () { + $http.put('/register/manage', $scope.handleDetail).then(function (resp) { + $scope.$close(); + },function (resp) { + + }); + } + }]); + + app.controller('citypartnerRegisterListCtrl', ['$scope', '$http', 'commonDialog', function ($scope, $http, commonDialog) { + $scope.pagination = {}; + $scope.listRegisters = function (page) { + // page = page || $scope.pagination.page || 1; + $http.get('/sys/citypartners').then(function (resp) { + $scope.cityPartners = resp.data; + // $scope.cityPartners = resp.data.data; + // $scope.pagination = resp.data.pagination; + }) + }; + $scope.listRegisters(1); + + $scope.handleRegister = function (registry) { + commonDialog.confirm({ + title: 'Confirm', + content: '操作无法撤销，确认继续？' + }).then(function () { + $http.put('/sys/citypartners/' + registry.partner_id + '/handle').then(function () { + commonDialog.alert({title: 'Success', content: '处理成功', type: 'success'}); + $scope.listRegisters(); + }, function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + }) + }) + }; }]); app.filter('cut', function () { diff --git a/src/main/ui/static/payment/partner/templates/add_handle_log.html b/src/main/ui/static/payment/partner/templates/add_handle_log.html new file mode 100644 index 000000000..b80a2b2ee --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/add_handle_log.html @@ -0,0 +1,25 @@ +
    +

    Handle Detail

    +
    + +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    diff --git a/src/main/ui/static/payment/partner/templates/partner_application.html b/src/main/ui/static/payment/partner/templates/partner_application.html new file mode 100644 index 000000000..5541bd35e --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/partner_application.html @@ -0,0 +1,106 @@ +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    + +
    +
    +
    + +
    +
    +
    +

    Application List

    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Application TimeCompany NameSuburbSourceApprove StatusPartner CodeProgressOperation
    + PC + 公众号菜单 + 公众号推送 + 小程序申请 + App申请 + + Waiting Approving + BD Approaching ({{partner.bd_user_name}}) + Pass ({{partner.bd_user_name}} {{partner.apply_approve_time}}) + Not Pass + + {{partner.client_moniker}} + + + Link + + + Detail + +
    + +
    +
    + +
    +
    Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
    +
    +
    +
    + + +
    + +
    +
    +
    + \ No newline at end of file diff --git a/src/main/ui/static/payment/partner/templates/partner_application_detail.html b/src/main/ui/static/payment/partner/templates/partner_application_detail.html index 7f8fc903e..2dbbe5252 100644 --- a/src/main/ui/static/payment/partner/templates/partner_application_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_application_detail.html @@ -2,13 +2,6 @@

    -
      -
    1. - Notice -
      2. -
    2. Partner Application
      3. -
    3. Partner Detail
      4. -
    diff --git a/src/main/ui/static/payment/partner/templates/partners_applications.html b/src/main/ui/static/payment/partner/templates/partners_applications.html deleted file mode 100644 index 4f9f53f4a..000000000 --- a/src/main/ui/static/payment/partner/templates/partners_applications.html +++ /dev/null @@ -1,133 +0,0 @@ - -
    -

    Partner Application

    -
      -
    1. - Payment -
      2. -
    2. Partner Applications
      3. -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    - - -
    -
    - -
    -
    -
    - -
    -
    -
    -

    Application List

    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Application TimeCompany NameSuburbSourceApprove StatusPartner CodeProgressOperation
    - PC - 公众号菜单 - 公众号推送 - 小程序申请 - App申请 - - Waiting Approving - BD Approaching ({{partner.bd_user_name}}) - Pass ({{partner.bd_user_name}} {{partner.apply_approve_time}}) - Not Pass - - {{partner.client_moniker}} - - - Link - - - Detail - -
    - -
    -
    - -
    -
    Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
    -
    -
    -
    - - -
    - -
    -
    -
    -
    -
    -
    -
    \ No newline at end of file diff --git a/src/main/ui/static/payment/partner/templates/partners_apply.html b/src/main/ui/static/payment/partner/templates/partners_apply.html new file mode 100644 index 000000000..d2ac8e958 --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/partners_apply.html @@ -0,0 +1,41 @@ + +
    +

    Partner Application

    +
      +
    1. + Payment +
      2. +
    2. Partner Applications
      3. +
    +
    + +
    +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    + + + diff --git a/src/main/ui/static/payment/partner/templates/simple_application_detail.html b/src/main/ui/static/payment/partner/templates/simple_application_detail.html index 10cff1183..fd8995609 100644 --- a/src/main/ui/static/payment/partner/templates/simple_application_detail.html +++ b/src/main/ui/static/payment/partner/templates/simple_application_detail.html @@ -3,17 +3,286 @@ 暂无 -
      -
    1. - Notice -
      2. -
    2. Application & Open
      3. -
    3. Apply Detail
      4. -
    -
    +
    +
    + + +
    +
    +
    + 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 +
    +
    +

    +
    +
    + +
    +
    +
    +
    +     + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + +
    Handle TimeOperatorDetail
    {{log.create_time}}{{log.auditor}}{{log.remark}}
    +
    + +
    +
    +
    + +
    + + +
    +
    + + <!–
    –> - - - - - - - + <!––> + <!––> + <!–
    –>
    Refuse @@ -105,20 +374,20 @@

    - - + <!–
    –> + <!––> - - - - - - + <!–
    –> + <!–

    –> + <!–
    –> + <!–
    –> + <!–
    –> + <!––> - - - - + <!–
    –> + <!–

    –> + <!–
    –> + <!–
    –>
    @@ -134,20 +403,20 @@

    - - + <!–
    –> + <!––> - - - - - - + <!–
    –> + <!–

    –> + <!–
    –> + <!–
    –> + <!–
    –> + <!––> - - - - + <!–
    –> + <!–

    –> + <!–
    –> + <!–
    –>
    @@ -186,7 +455,7 @@
    - + <!–end 商户基本资料–>
    Contact Information
    @@ -198,13 +467,13 @@

    - - + <!–
    –> + <!––> - - - - + <!–
    –> + <!–

    –> + <!–
    –> + <!–
    –>
    @@ -222,7 +491,7 @@
    - + <!–end 商户联系资料–>
    Approaching Progress
    @@ -245,5 +514,5 @@
    - + --> \ No newline at end of file diff --git a/src/main/ui/static/payment/partner/templates/simple_applications.html b/src/main/ui/static/payment/partner/templates/simple_applications.html index 6d5530245..a88245bc3 100644 --- a/src/main/ui/static/payment/partner/templates/simple_applications.html +++ b/src/main/ui/static/payment/partner/templates/simple_applications.html @@ -7,14 +7,25 @@
    + 已申请 +    + + + + +
    @@ -34,6 +45,7 @@ Company Name Status + Handle Detail Create Time Apply Source Operation @@ -47,12 +59,19 @@ 已申请 ({{apply.client_moniker}}) - 申请中 + 申请失败 (step2) (step3) (step4) + + + 未处理 + 处理中 + + / + pc @@ -60,7 +79,7 @@     + ui-sref="partner_apply.apply_detail({client_pre_apply_id:apply.client_pre_apply_id,status:apply.status})"> Detail