diff --git a/pom.xml b/pom.xml index c7dd78e36..f66157d48 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 0.2.0 + 0.2.0-dev 4.0.0 @@ -28,6 +28,10 @@ au.com.royalpay.payment alipay-core + + au.com.royalpay.payment + hf-core + au.com.royalpay.payment jd-core diff --git a/src/db/modify.sql b/src/db/modify.sql index b2e1be0e5..177c8ce98 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -580,4 +580,21 @@ 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; + +ALTER TABLE `sys_client_pre_apply` +ADD COLUMN `status` tinyint(2) NULL DEFAULT 0 COMMENT '0:未处理，1：处理中，2：处理完成'; \ No newline at end of file diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 69c6c2f42..b94792b02 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -553,13 +553,11 @@ public class RetailAppServiceImp implements RetailAppService { JSONObject result = PageListUtils.buildPageListResult(logs); if (appQueryBean.getPage() == 1) { if (!logs.isEmpty() && logs.size() > 0) { - JSONObject clearingDetail = clearingDetailMapper.findByDetailId(logs.get(0).getIntValue("clearing_order")); - if (clearingDetail!=null){ - JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); - if(clearingLog.getBooleanValue("editable")){ + JSONObject clearingLog = clearingLogMapper.findById(logs.get(0).getIntValue("clearing_id")); + if(clearingLog.getBoolean("editable")){ result.put("padding", true); + logs.get(0).put("padding",true); } - } } } return result; 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/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java index 196ccd952..6431ae5e8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java @@ -404,7 +404,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider if (settle.getBigDecimal("clearing_amount").compareTo(BigDecimal.ZERO) == 0) { continue; } - if (bank != null && Objects.equals(settle.getString("settle_bank"), bank)) { + if (bank != null && !Objects.equals(settle.getString("settle_bank"), bank)) { continue; } Row row = sheet.createRow(rowNum++); 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/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java index 28b1d03c2..efbba73e0 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 @@ -319,4 +319,5 @@ public interface ClientManager { void removeSub(String client_moniker, JSONObject manager); + String getShortLink(String client_moniker); } 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 a47653f6c..ba11193c2 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 @@ -2658,6 +2658,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); if(clearingLog.getBooleanValue("editable")){ result.put("padding", true); + logs.get(0).put("padding",true); + logger.info("##editable"+clearingLog.getBooleanValue("editable")); } } } @@ -3663,4 +3665,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } mailService.removeUnsub(sub.getLong("id")); } + + @Override + public String getShortLink(String client_moniker){ + String longUrl = PlatformEnvironment.getEnv().concatUrl("/api/v1.0/hf_gateway/partners/"+client_moniker+"/jump"); + MpWechatApi api = mpWechatApiProvider.getNewPaymentApi(); + return api.registerShortUrl(longUrl); + } } 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 cdd48cdaa..73b5b4929 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 @@ -838,6 +838,8 @@ public class TradeLogServiceImpl implements TradeLogService { JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); if(clearingLog.getBooleanValue("editable")){ result.put("padding", true); + logs.get(0).put("padding",true); + logger.info("##editable"+clearingLog.getBooleanValue("editable")); } } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4c7992c26..a5ac9569e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -68,7 +68,7 @@ app.cms.host=https://www.royalpay.com.au/ app.server.ip=127.0.0.1 app.redpack_auth.enable=false - +hf.rsa-file=/opt/2000604000101.pfx ##积分商城 app.customer.host=https://customer.royalpay.com.au/ customer.app.appid=customer 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/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js index 1eb5e5a0c..944faa786 100644 --- a/src/main/ui/static/analysis/clearing-log.js +++ b/src/main/ui/static/analysis/clearing-log.js @@ -249,6 +249,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func $scope.noticeResend = false; $scope.analysisFilter = {}; $scope.currentAnalysis = $scope.detail; + $scope.pageCtrl = {visible:{}}; function getAnalysisTemplate() { return [ diff --git a/src/main/ui/static/analysis/templates/settlement_detail.html b/src/main/ui/static/analysis/templates/settlement_detail.html index 44c02d21a..51d386d05 100644 --- a/src/main/ui/static/analysis/templates/settlement_detail.html +++ b/src/main/ui/static/analysis/templates/settlement_detail.html @@ -70,7 +70,8 @@ - @@ -137,22 +138,6 @@ - -
    -
    -
      -
    • -
      - T+{{group.settleDays}} - - Clients:{{group.clients}}, Amount:{{group.settleAmount|currency:''}} - -
      -
      • -
    -
    -
      @@ -170,16 +155,17 @@
    -
    -
    T+{{group.settleDays}}: Clients:{{group.clients}} +
    + T+{{group.settleDays}}: Clients:{{group.clients}} Amount:{{group.settleAmount|currency:''}} + Click to hide
    -
    - +
    +
    - @@ -193,8 +179,10 @@ - - + + @@ -47,12 +59,19 @@ +
    Source Bank Client Moniker Transaction Date Gross Amount
    + + + {{settleItem.settle_date_from|limitTo:10}} ~ diff --git a/src/main/ui/static/citypartner/citypartner.js b/src/main/ui/static/citypartner/citypartner.js index 6dae27558..fd3504804 100644 --- a/src/main/ui/static/citypartner/citypartner.js +++ b/src/main/ui/static/citypartner/citypartner.js @@ -5,7 +5,7 @@ define(['angular'], function (angular) { 'use strict'; var app = angular.module('citypartner', ['ui.router']); app.config(['$stateProvider', function ($stateProvider) { - $stateProvider.state('citypartner_reg', { + $stateProvider.state('partner_apply.citypartner_reg', { url: '/citypartner_registries', templateUrl: '/static/citypartner/templates/citypartner_registers.html', controller: 'citypartnerRegisterListCtrl' diff --git a/src/main/ui/static/css/common.css b/src/main/ui/static/css/common.css index 327a7e4e8..b88c7fdef 100644 --- a/src/main/ui/static/css/common.css +++ b/src/main/ui/static/css/common.css @@ -549,21 +549,21 @@ position: relative; } -.active-rate-view:after{ - content:''; - clear:both; - display:block; +.active-rate-view:after { + content: ''; + clear: both; + display: block; } .active-rate-view .client-names { - width:100px; + width: 100px; overflow-x: hidden; float: left; border-right: 2px solid #bbb; display: block; } -.active-rate-view .client-name{ +.active-rate-view .client-name { width: 100%; text-align: left; font-weight: bold; @@ -571,245 +571,244 @@ border-bottom: 1px solid #bbb; } -.active-rate-view .client-row{ +.active-rate-view .client-row { height: 30px; line-height: 30px; white-space: nowrap; } -.active-rate-view .analysis-box{ +.active-rate-view .analysis-box { overflow-x: auto; display: block; float: left; padding-bottom: 5px; } -.active-rate-view .analysis-item{ +.active-rate-view .analysis-item { width: 35px; height: 100%; display: inline-block; - text-align:center; - line-height:30px; + text-align: center; + line-height: 30px; overflow: hidden; - border-right:1px solid #bbb; - border-bottom:1px solid #bbb; + border-right: 1px solid #bbb; + border-bottom: 1px solid #bbb; } -.selectRow,.table-striped>tbody>tr.selectRow:nth-of-type(odd){ +.selectRow, .table-striped > tbody > tr.selectRow:nth-of-type(odd) { background-color: #E0EEE0; } - -.fountainGBox{ - position:relative; - width:108px; - height:13px; +.fountainGBox { + position: relative; + width: 108px; + height: 13px; margin: auto auto 20px; } -.fountainG{ - position:absolute; - top:0; - background-color:rgb(0,0,0); - width:13px; - height:13px; - animation-name:bounce_fountainG; - -o-animation-name:bounce_fountainG; - -ms-animation-name:bounce_fountainG; - -webkit-animation-name:bounce_fountainG; - -moz-animation-name:bounce_fountainG; - animation-duration:1.5s; - -o-animation-duration:1.5s; - -ms-animation-duration:1.5s; - -webkit-animation-duration:1.5s; - -moz-animation-duration:1.5s; - animation-iteration-count:infinite; - -o-animation-iteration-count:infinite; - -ms-animation-iteration-count:infinite; - -webkit-animation-iteration-count:infinite; - -moz-animation-iteration-count:infinite; - animation-direction:normal; - -o-animation-direction:normal; - -ms-animation-direction:normal; - -webkit-animation-direction:normal; - -moz-animation-direction:normal; - transform:scale(.3); - -o-transform:scale(.3); - -ms-transform:scale(.3); - -webkit-transform:scale(.3); - -moz-transform:scale(.3); - border-radius:9px; - -o-border-radius:9px; - -ms-border-radius:9px; - -webkit-border-radius:9px; - -moz-border-radius:9px; -} - -.fountainG.fountainG_1{ - left:0; - animation-delay:0.6s; - -o-animation-delay:0.6s; - -ms-animation-delay:0.6s; - -webkit-animation-delay:0.6s; - -moz-animation-delay:0.6s; -} - -.fountainG.fountainG_2{ - left:13px; - animation-delay:0.75s; - -o-animation-delay:0.75s; - -ms-animation-delay:0.75s; - -webkit-animation-delay:0.75s; - -moz-animation-delay:0.75s; -} - -.fountainG.fountainG_3{ - left:27px; - animation-delay:0.9s; - -o-animation-delay:0.9s; - -ms-animation-delay:0.9s; - -webkit-animation-delay:0.9s; - -moz-animation-delay:0.9s; -} - -.fountainG.fountainG_4{ - left:40px; - animation-delay:1.05s; - -o-animation-delay:1.05s; - -ms-animation-delay:1.05s; - -webkit-animation-delay:1.05s; - -moz-animation-delay:1.05s; -} - -.fountainG.fountainG_5{ - left:54px; - animation-delay:1.2s; - -o-animation-delay:1.2s; - -ms-animation-delay:1.2s; - -webkit-animation-delay:1.2s; - -moz-animation-delay:1.2s; -} - -.fountainG.fountainG_6{ - left:67px; - animation-delay:1.35s; - -o-animation-delay:1.35s; - -ms-animation-delay:1.35s; - -webkit-animation-delay:1.35s; - -moz-animation-delay:1.35s; -} - -.fountainG.fountainG_7{ - left:81px; - animation-delay:1.5s; - -o-animation-delay:1.5s; - -ms-animation-delay:1.5s; - -webkit-animation-delay:1.5s; - -moz-animation-delay:1.5s; -} - -.fountainG.fountainG_8{ - left:94px; - animation-delay:1.64s; - -o-animation-delay:1.64s; - -ms-animation-delay:1.64s; - -webkit-animation-delay:1.64s; - -moz-animation-delay:1.64s; -} - - - -@keyframes bounce_fountainG{ - 0%{ - transform:scale(1); - background-color:rgb(0,0,0); +.fountainG { + position: absolute; + top: 0; + background-color: rgb(0, 0, 0); + width: 13px; + height: 13px; + animation-name: bounce_fountainG; + -o-animation-name: bounce_fountainG; + -ms-animation-name: bounce_fountainG; + -webkit-animation-name: bounce_fountainG; + -moz-animation-name: bounce_fountainG; + animation-duration: 1.5s; + -o-animation-duration: 1.5s; + -ms-animation-duration: 1.5s; + -webkit-animation-duration: 1.5s; + -moz-animation-duration: 1.5s; + animation-iteration-count: infinite; + -o-animation-iteration-count: infinite; + -ms-animation-iteration-count: infinite; + -webkit-animation-iteration-count: infinite; + -moz-animation-iteration-count: infinite; + animation-direction: normal; + -o-animation-direction: normal; + -ms-animation-direction: normal; + -webkit-animation-direction: normal; + -moz-animation-direction: normal; + transform: scale(.3); + -o-transform: scale(.3); + -ms-transform: scale(.3); + -webkit-transform: scale(.3); + -moz-transform: scale(.3); + border-radius: 9px; + -o-border-radius: 9px; + -ms-border-radius: 9px; + -webkit-border-radius: 9px; + -moz-border-radius: 9px; +} + +.fountainG.fountainG_1 { + left: 0; + animation-delay: 0.6s; + -o-animation-delay: 0.6s; + -ms-animation-delay: 0.6s; + -webkit-animation-delay: 0.6s; + -moz-animation-delay: 0.6s; +} + +.fountainG.fountainG_2 { + left: 13px; + animation-delay: 0.75s; + -o-animation-delay: 0.75s; + -ms-animation-delay: 0.75s; + -webkit-animation-delay: 0.75s; + -moz-animation-delay: 0.75s; +} + +.fountainG.fountainG_3 { + left: 27px; + animation-delay: 0.9s; + -o-animation-delay: 0.9s; + -ms-animation-delay: 0.9s; + -webkit-animation-delay: 0.9s; + -moz-animation-delay: 0.9s; +} + +.fountainG.fountainG_4 { + left: 40px; + animation-delay: 1.05s; + -o-animation-delay: 1.05s; + -ms-animation-delay: 1.05s; + -webkit-animation-delay: 1.05s; + -moz-animation-delay: 1.05s; +} + +.fountainG.fountainG_5 { + left: 54px; + animation-delay: 1.2s; + -o-animation-delay: 1.2s; + -ms-animation-delay: 1.2s; + -webkit-animation-delay: 1.2s; + -moz-animation-delay: 1.2s; +} + +.fountainG.fountainG_6 { + left: 67px; + animation-delay: 1.35s; + -o-animation-delay: 1.35s; + -ms-animation-delay: 1.35s; + -webkit-animation-delay: 1.35s; + -moz-animation-delay: 1.35s; +} + +.fountainG.fountainG_7 { + left: 81px; + animation-delay: 1.5s; + -o-animation-delay: 1.5s; + -ms-animation-delay: 1.5s; + -webkit-animation-delay: 1.5s; + -moz-animation-delay: 1.5s; +} + +.fountainG.fountainG_8 { + left: 94px; + animation-delay: 1.64s; + -o-animation-delay: 1.64s; + -ms-animation-delay: 1.64s; + -webkit-animation-delay: 1.64s; + -moz-animation-delay: 1.64s; +} + +@keyframes bounce_fountainG { + 0% { + transform: scale(1); + background-color: rgb(0, 0, 0); } - 100%{ - transform:scale(.3); - background-color:rgb(255,255,255); + 100% { + transform: scale(.3); + background-color: rgb(255, 255, 255); } } -@-o-keyframes bounce_fountainG{ - 0%{ - -o-transform:scale(1); - background-color:rgb(0,0,0); +@-o-keyframes bounce_fountainG { + 0% { + -o-transform: scale(1); + background-color: rgb(0, 0, 0); } - 100%{ - -o-transform:scale(.3); - background-color:rgb(255,255,255); + 100% { + -o-transform: scale(.3); + background-color: rgb(255, 255, 255); } } -@-ms-keyframes bounce_fountainG{ - 0%{ - -ms-transform:scale(1); - background-color:rgb(0,0,0); +@-ms-keyframes bounce_fountainG { + 0% { + -ms-transform: scale(1); + background-color: rgb(0, 0, 0); } - 100%{ - -ms-transform:scale(.3); - background-color:rgb(255,255,255); + 100% { + -ms-transform: scale(.3); + background-color: rgb(255, 255, 255); } } -@-webkit-keyframes bounce_fountainG{ - 0%{ - -webkit-transform:scale(1); - background-color:rgb(0,0,0); +@-webkit-keyframes bounce_fountainG { + 0% { + -webkit-transform: scale(1); + background-color: rgb(0, 0, 0); } - 100%{ - -webkit-transform:scale(.3); - background-color:rgb(255,255,255); + 100% { + -webkit-transform: scale(.3); + background-color: rgb(255, 255, 255); } } -@-moz-keyframes bounce_fountainG{ - 0%{ - -moz-transform:scale(1); - background-color:rgb(0,0,0); +@-moz-keyframes bounce_fountainG { + 0% { + -moz-transform: scale(1); + background-color: rgb(0, 0, 0); } - 100%{ - -moz-transform:scale(.3); - background-color:rgb(255,255,255); + 100% { + -moz-transform: scale(.3); + background-color: rgb(255, 255, 255); } } - -.analysis-nav ul li{ +.analysis-nav ul li { margin-right: 10px; margin-bottom: 10px; background-color: white; } -.analysis-nav .nav-pills li a:hover,.analysis-nav .nav-pills li a:focus,.analysis-nav .nav-pills li.active a{ + +.analysis-nav .nav-pills li a:hover, .analysis-nav .nav-pills li a:focus, .analysis-nav .nav-pills li.active a { background-color: #f06101; - border-top-color:#f06101; + border-top-color: #f06101; } -.channel-icon{ +.channel-icon { width: 16px; height: 16px; } -.channel-icon-lg{ + +.channel-icon-lg { width: 48px; height: 48px; } -.settle-forecast .rc-box .week .day{ - height:120px; + +.settle-forecast .rc-box .week .day { + height: 120px; } -.dashboard-page .tooltip .tooltip-inner{ +.dashboard-page .tooltip .tooltip-inner { max-width: 600px; text-align: center; } -.partner-settlement_page .tooltip .tooltip-inner{ - max-width: 600px; - } +.partner-settlement_page .tooltip .tooltip-inner { + max-width: 600px; +} .partner_list_style { position: relative; @@ -824,8 +823,17 @@ color: #ffffff; } -.check-i{ +.check-i { color: #00a65a; float: right; margin-top: 8px; +} + +.settle-result-box .box-header { + cursor: pointer; +} + +.settle-result-box .settle-result-table .bank-logo { + width: 24px; + vertical-align: middle; } \ No newline at end of file diff --git a/src/main/ui/static/images/bank/ANZ.png b/src/main/ui/static/images/bank/ANZ.png new file mode 100644 index 000000000..661d0e6d0 Binary files /dev/null and b/src/main/ui/static/images/bank/ANZ.png differ diff --git a/src/main/ui/static/images/bank/CBA.png b/src/main/ui/static/images/bank/CBA.png new file mode 100644 index 000000000..733de6180 Binary files /dev/null and b/src/main/ui/static/images/bank/CBA.png differ diff --git a/src/main/ui/static/payment/partner/partner-apply.js b/src/main/ui/static/payment/partner/partner-apply.js index 95eccd922..c936abe44 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,13 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS return $http.get('/partners/application/' + $stateParams.client_apply_id); }] } - }).state('partner_application.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', - 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); - }] - } }) }]); + 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 = {}; @@ -213,27 +207,6 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS }]); - app.controller('simpleApplicationListCtrl', ['$scope', '$state', '$http', '$uibModal', 'commonDialog', 'industryMap', 'stateMap','countryMap', - function ($scope, $state, $http, $uibModal, commonDialog) { - $scope.pagination = {}; - $scope.params = {}; - - $scope.loadSimpleApplies = function (page) { - var params = angular.copy($scope.params); - params.page = page || $scope.pagination.page || 1; - $http.get('/register/manage', {params: params}).then(function (resp) { - $scope.applies = resp.data.data; - $scope.pagination = resp.data.pagination; - }); - }; - - $scope.loadSimpleApplies(1); - }]); - - app.controller('simpleApplicationDetailCtrl', [ '$scope', '$http', '$state', '$uibModal', 'commonDialog','apply', function ($scope, $http, $state, $uibModal, commonDialog,apply) { - $scope.partner = apply.data; - }]); - app.filter('cut', function () { return function (value, wordwise, max, tail) { if (!value) return ''; diff --git a/src/main/ui/static/payment/partner/simple-apply.js b/src/main/ui/static/payment/partner/simple-apply.js new file mode 100644 index 000000000..53bcb622e --- /dev/null +++ b/src/main/ui/static/payment/partner/simple-apply.js @@ -0,0 +1,134 @@ +define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiSelect'], function (angular) { + 'use strict'; + var app = angular.module('simpleApplyApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch', 'ngFileUpload', 'ui.select']); + app.config(['$stateProvider', function ($stateProvider) { + $stateProvider.state('partner_apply.simple_application', { + url: '/simple/applications', + templateUrl: '/static/payment/partner/templates/simple_applications.html', + controller: 'simpleApplicationListCtrl', + data: {label: '商户自主申请列表'} + }).state('partner_apply.apply_detail', { + url: '/{client_pre_apply_id}/detail', + templateUrl: '/static/payment/partner/templates/simple_application_detail.html', + controller: 'simpleApplicationDetailCtrl', + resolve: { + client_pre_apply_id: ['$stateParams', function ($stateParams) { + return $stateParams.client_pre_apply_id; + }], + index: ['$stateParams', function ($stateParams) { + return 0; + }] + } + }).state('partner_apply.handle_detail', { + url: '/{client_pre_apply_id}/handle', + templateUrl: '/static/payment/partner/templates/simple_application_detail.html', + controller: 'simpleApplicationDetailCtrl', + resolve: { + client_pre_apply_id: ['$stateParams', function ($stateParams) { + return $stateParams.client_pre_apply_id; + }], + index: ['$stateParams', function ($stateParams) { + return 1; + }] + } + }) + }]); + app.controller('simpleApplicationListCtrl', ['$scope', '$state', '$http', '$uibModal', 'commonDialog', 'industryMap', 'stateMap','countryMap', + 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; + $http.get('/register/manage', {params: params}).then(function (resp) { + $scope.applies = resp.data.data; + $scope.pagination = resp.data.pagination; + }); + }; + + $scope.loadSimpleApplies(1); + }]); + + app.controller('simpleApplicationDetailCtrl', [ '$scope', '$http', '$state', '$uibModal', 'commonDialog','client_pre_apply_id','index', function ($scope, $http, $state, $uibModal, commonDialog,client_pre_apply_id,index) { + $scope.pagination = {}; + $scope.index = index; + $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.filter('cut', function () { + return function (value, wordwise, max, tail) { + if (!value) return ''; + + max = parseInt(max, 10); + if (!max) return value; + if (value.length <= max) return value; + + value = value.substr(0, max); + if (wordwise) { + var lastspace = value.lastIndexOf(' '); + if (lastspace != -1) { + value = value.substr(0, lastspace); + } + } + return value + (tail || ' …'); + }; + }); + return app; +}); \ No newline at end of file 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..f2f532ace --- /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..0f33a608d 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 StatusHandle Status Create Time Apply Source Operation 已申请 ({{apply.client_moniker}}) - 申请中 + 申请失败 (step2) (step3) (step4) + + 未处理 + 处理中 + + — + pc @@ -60,8 +79,12 @@ + ui-sref="partner_apply.apply_detail({client_pre_apply_id:apply.client_pre_apply_id})"> Detail +
    + + Handle