msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add 新增组织管理员身份

Browse Source
master
luoyang 5 years ago
parent c38da4ba27
commit 5b7f5e43c5
20 changed files with 114 additions and 69 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.1.2</jib-maven-plugin.version> <jib-maven-plugin.version>1.1.2</jib-maven-plugin.version>
<docker-image.version>1.1.17</docker-image.version> <docker-image.version>1.1.18</docker-image.version>
</properties> </properties>
<dependencies> <dependencies>

6
src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java
Unescape View File

@ -53,15 +53,15 @@ public class ClientPreApplyBean {
private String codeKey; private String codeKey;
private boolean agree; private boolean agree;
private String nation_code; private String nation_code;
private String client_pay_type; private String client_pay_type = "2";
private String client_pay_desc; private String client_pay_desc = "201";
public JSONObject insertObject() { public JSONObject insertObject() {
JSONObject res = (JSONObject) JSON.toJSON(this); JSONObject res = (JSONObject) JSON.toJSON(this);
List<String> keys = new ArrayList<>(); List<String> keys = new ArrayList<>();
res.keySet().forEach(p-> { res.keySet().forEach(p-> {
if (StringUtils.isEmpty(res.getString(p).trim())) { if (StringUtils.isBlank(res.getString(p))) {
keys.add(p); keys.add(p);
} }
}); });

2
src/main/java/au/com/royalpay/payment/manage/management/sysconfig/core/impls/PermissionManagerImpl.java
Unescape View File

@ -81,7 +81,7 @@ public class PermissionManagerImpl implements PermissionManager {
func.put("bdleader", ManagerRole.BD_LEADER.hasRole(role)); func.put("bdleader", ManagerRole.BD_LEADER.hasRole(role));
func.put("riskmanager", ManagerRole.RISK_MANAGER.hasRole(role)); func.put("riskmanager", ManagerRole.RISK_MANAGER.hasRole(role));
func.put("guest", ManagerRole.GUEST.hasRole(role)); func.put("guest", ManagerRole.GUEST.hasRole(role));
// manager.put("orgmanager", ManagerRole.ORG_MANAGER.hasRole(role)); func.put("orgmanager", ManagerRole.ORG_MANAGER.hasRole(role));
func.put("salesmanager", ManagerRole.SALES_MANAGER.hasRole(role)); func.put("salesmanager", ManagerRole.SALES_MANAGER.hasRole(role));
// manager.put("datacontent", ManagerRole.DATA_CONTENT.hasRole(role)); // manager.put("datacontent", ManagerRole.DATA_CONTENT.hasRole(role));

2
src/main/java/au/com/royalpay/payment/manage/organizations/core/impls/OrgManagerImpl.java
Unescape View File

@ -178,7 +178,7 @@ public class OrgManagerImpl implements OrgManager {
if (manager.getInteger("org_id")!=null){ if (manager.getInteger("org_id")!=null){
List<JSONObject> orgs = orgMapper.listOrgAndChild(manager.getIntValue("org_id")); List<JSONObject> orgs = orgMapper.listOrgAndChild(manager.getIntValue("org_id"));
List<Integer> orgIds = orgs.stream().map(org->org.getIntValue("org_id")).collect(Collectors.toList()); List<Integer> orgIds = orgs.stream().map(org->org.getIntValue("org_id")).collect(Collectors.toList());
if (!orgIds.contains(params.getString("org_id"))){ if (!orgIds.contains(params.getIntValue("org_id"))){
throw new ForbiddenException("You have no permission to query the org"); throw new ForbiddenException("You have no permission to query the org");
} }

6
src/main/java/au/com/royalpay/payment/manage/signin/beans/QueryManagerBean.java
Unescape View File

@ -62,9 +62,9 @@ public class QueryManagerBean {
if(role.equals("100000000000")){ if(role.equals("100000000000")){
mask = ManagerRole.GUEST.getMask(); mask = ManagerRole.GUEST.getMask();
} }
// if(role.equals("1000000000000")){ if(role.equals("1000000000000")){
// mask = ManagerRole.ORG_MANAGER.getMask(); mask = ManagerRole.ORG_MANAGER.getMask();
// } }
if(role.equals("10000000000000")){ if(role.equals("10000000000000")){
mask = ManagerRole.SALES_MANAGER.getMask(); mask = ManagerRole.SALES_MANAGER.getMask();
} }

2
src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java
Unescape View File

@ -63,7 +63,7 @@ public class ManagerAccountServiceImpl implements ManagerAccountsService {
manager.put("bdleader", ManagerRole.BD_LEADER.hasRole(role)); manager.put("bdleader", ManagerRole.BD_LEADER.hasRole(role));
manager.put("riskmanager", ManagerRole.RISK_MANAGER.hasRole(role)); manager.put("riskmanager", ManagerRole.RISK_MANAGER.hasRole(role));
manager.put("guest", ManagerRole.GUEST.hasRole(role)); manager.put("guest", ManagerRole.GUEST.hasRole(role));
// manager.put("orgmanager", ManagerRole.ORG_MANAGER.hasRole(role)); manager.put("orgmanager", ManagerRole.ORG_MANAGER.hasRole(role));
manager.put("salesmanager", ManagerRole.SALES_MANAGER.hasRole(role)); manager.put("salesmanager", ManagerRole.SALES_MANAGER.hasRole(role));
// manager.put("datacontent", ManagerRole.DATA_CONTENT.hasRole(role)); // manager.put("datacontent", ManagerRole.DATA_CONTENT.hasRole(role));

22
src/main/ui/manage.html
Unescape View File

@ -244,8 +244,8 @@ margin-bottom: 10%;"/>
ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i> ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
<i class="fa fa-tripadvisor" title="GUEST" <i class="fa fa-tripadvisor" title="GUEST"
ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i> ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
<!--<i class="fa fa-user-plus" title="Org Manager"--> <i class="fa fa-user-plus" title="Org Manager"
<!--ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>--> ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
<i class="fa fa-ticket" title="Sales Manager" <i class="fa fa-ticket" title="Sales Manager"
ng-class="{'text-orange':!('10000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i> ng-class="{'text-orange':!('10000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
<!--<i class="fa fa-save" title="Data content"--> <!--<i class="fa fa-save" title="Data content"-->
@ -306,17 +306,17 @@ margin-bottom: 10%;"/>
<i class="fa fa-plus"></i> <span>商户进件|New Partner</span> <i class="fa fa-plus"></i> <span>商户进件|New Partner</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="'partner_analysis'|withModule"> <li ui-sref-active="active" ng-if="('partner_analysis'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)">
<a ui-sref="partners_analysis" ui-sref-opts="{reload:true}"> <a ui-sref="partners_analysis" ui-sref-opts="{reload:true}">
<i class="fa fa-list-alt"></i> <span>商户统计|Merchants Data</span> <i class="fa fa-list-alt"></i> <span>商户统计|Merchants Data</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="'clientrate'|withModule"> <li ui-sref-active="active" ng-if="('clientrate'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)">
<a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
<i class="fa fa-shopping-cart"></i> <span>商户活跃度</span> <i class="fa fa-shopping-cart"></i> <span>商户活跃度</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="('merchantAmount'|withModule)"> <li ui-sref-active="active" ng-if="('merchantAmount'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)">
<a ui-sref="merchantAmountAnalysis" ui-sref-opts="{reload:true}"> <a ui-sref="merchantAmountAnalysis" ui-sref-opts="{reload:true}">
<i class="fa fa-area-chart"></i> <span>商户交易额统计</span> <i class="fa fa-area-chart"></i> <span>商户交易额统计</span>
</a> </a>
@ -343,22 +343,22 @@ margin-bottom: 10%;"/>
<i class="fa fa-list-alt"></i> <span>交易流水|Trades Logs</span> <i class="fa fa-list-alt"></i> <span>交易流水|Trades Logs</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="('transAnalysis'|withModule)"> <li ui-sref-active="active" ng-if="('transAnalysis'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)">
<a ui-sref="analysis_transanalysis" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_transanalysis" ui-sref-opts="{reload:true}">
<i class="fa fa-area-chart"></i> <span>交易数据|Transaction Data</span> <i class="fa fa-area-chart"></i> <span>交易数据|Transaction Data</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="('dashboard'|withModule)"> <li ui-sref-active="active" ng-if="('dashboard'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)">
<a ui-sref="analysis_gateway" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_gateway" ui-sref-opts="{reload:true}">
<i class="fa fa-area-chart"></i> <span>Gateway统计</span> <i class="fa fa-area-chart"></i> <span>Gateway统计</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="('refundAnalysisApp'|withModule)"> <li ui-sref-active="active" ng-if="('refundAnalysisApp'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)">
<a ui-sref="analysis_refundAnalysis" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_refundAnalysis" ui-sref-opts="{reload:true}">
<i class="fa fa-area-chart"></i> <span>退款统计|Refund Analysis</span> <i class="fa fa-area-chart"></i> <span>退款统计|Refund Analysis</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="('channels_Analysis'|withModule)"> <li ui-sref-active="active" ng-if="('channels_Analysis'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)">
<a ui-sref="analysis_channelsAnalysis" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_channelsAnalysis" ui-sref-opts="{reload:true}">
<i class="fa fa-area-chart"></i> <span>支付通道|Channels Analysis</span> <i class="fa fa-area-chart"></i> <span>支付通道|Channels Analysis</span>
</a> </a>
@ -442,7 +442,7 @@ margin-bottom: 10%;"/>
</ul> </ul>
</li> </li>
<li class="menu-group" ng-if="('100' | withRole)"> <li class="menu-group" ng-if="('100' | withRole) && (currentUser.org_id==null || currentUser.org_id==1)">
<p role="button" ng-class="{'active': Risk,'is-hide':hideSideBar}" ng-click="Risk = !Risk"> <p role="button" ng-class="{'active': Risk,'is-hide':hideSideBar}" ng-click="Risk = !Risk">
<span>风控管理|Risk</span> <span>风控管理|Risk</span>
<span class="pull-right-container"> <span class="pull-right-container">
@ -763,7 +763,7 @@ margin-bottom: 10%;"/>
</ul> </ul>
</li> </li>
<li class="menu-group" ng-if="roleNow=='bduser' || roleNow=='salesmanager' || roleNow=='director'"> <li class="menu-group" ng-if="(roleNow=='bduser' || roleNow=='salesmanager' || roleNow=='director') && (currentUser.org_id==null || currentUser.org_id==1)">
<p role="button" ng-class="{'active': Performance,'is-hide':hideSideBar}" ng-click="Performance = !Performance"> <p role="button" ng-class="{'active': Performance,'is-hide':hideSideBar}" ng-click="Performance = !Performance">
<span>绩效管理|Performance</span> <span>绩效管理|Performance</span>
<span class="pull-right-container"> <span class="pull-right-container">

4
src/main/ui/managev2.html
Unescape View File

@ -284,8 +284,8 @@ margin-bottom: 10%;"/>
ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i> ng-class="{'text-orange':!('10000000000'|withRole),'text-gray':('10000000000'|withRole)}"></i>
<i class="fa fa-tripadvisor" title="GUEST" <i class="fa fa-tripadvisor" title="GUEST"
ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i> ng-class="{'text-orange':!('100000000000'|withRole),'text-gray':('100000000000'|withRole)}"></i>
<!--<i class="fa fa-user-plus" title="Org Manager"--> <i class="fa fa-user-plus" title="Org Manager"
<!--ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>--> ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
<i class="fa fa-ticket" title="Sales Manager" <i class="fa fa-ticket" title="Sales Manager"
ng-class="{'text-orange':!('10000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i> ng-class="{'text-orange':!('10000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
<!--<i class="fa fa-save" title="Data content"--> <!--<i class="fa fa-save" title="Data content"-->

6
src/main/ui/static/boot/managerMainApp.js
Unescape View File

@ -241,6 +241,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
case "guest": case "guest":
rolenum = 2048; rolenum = 2048;
break; break;
case "orgmanager":
rolenum = 4096;
break;
case "riskmanager": case "riskmanager":
rolenum = 1024; rolenum = 1024;
break; break;
@ -286,6 +289,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
if ((role & 2048) >0){ if ((role & 2048) >0){
roleMenu.push({'value':'guest','module':"访客中心"}); roleMenu.push({'value':'guest','module':"访客中心"});
} }
if ((role & 4096) >0){
roleMenu.push({'value':'orgmanager','module':"代理商中心"});
}
if ((role & 8192) >0){ if ((role & 8192) >0){
roleMenu.push({'value':'salesmanager','module':"销管中心"}); roleMenu.push({'value':'salesmanager','module':"销管中心"});
} }

6
src/main/ui/static/boot/managerMainAppv2.js
Unescape View File

@ -36,6 +36,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
if ((role & 2048) >0){ if ((role & 2048) >0){
roleMenu.push({'value':'guest','module':"访客中心"}); roleMenu.push({'value':'guest','module':"访客中心"});
} }
if ((role & 4096) >0){
roleMenu.push({'value':'orgmanager','module':"代理商中心"});
}
if ((role & 8192) >0){ if ((role & 8192) >0){
roleMenu.push({'value':'salesmanager','module':"销管中心"}); roleMenu.push({'value':'salesmanager','module':"销管中心"});
} }
@ -137,6 +140,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
case "guest": case "guest":
roleNow = "访客中心"; roleNow = "访客中心";
break; break;
case "orgmanager":
roleNow = "代理商中心";
break;
default: default:
break; break;
} }

4
src/main/ui/static/config/managers/templates/managers.html
Unescape View File

@ -36,7 +36,7 @@
<option value="1000000000">BD Leader</option> <option value="1000000000">BD Leader</option>
<option value="10000000000">Risk Manager</option> <option value="10000000000">Risk Manager</option>
<option value="100000000000">Guest</option> <option value="100000000000">Guest</option>
<!--<option value="1000000000000">Org Manager</option>--> <option value="1000000000000">Org Manager</option>
<option value="10000000000000">Sales Manager</option> <option value="10000000000000">Sales Manager</option>
<!--<option value="100000000000000">Data Ccontent</option>--> <!--<option value="100000000000000">Data Ccontent</option>-->
</select> </select>
@ -117,7 +117,7 @@
<i class="fa fa-male" title="BD Leader" ng-class="{'text-green':manager.bdleader,'text-gray':!manager.bdleader}"></i> <i class="fa fa-male" title="BD Leader" ng-class="{'text-green':manager.bdleader,'text-gray':!manager.bdleader}"></i>
<i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':manager.riskmanager,'text-gray':!manager.riskmanager}"></i> <i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':manager.riskmanager,'text-gray':!manager.riskmanager}"></i>
<i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':manager.guest,'text-gray':!manager.guest}"></i> <i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':manager.guest,'text-gray':!manager.guest}"></i>
<!--<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':manager.orgmanager,'text-gray':!manager.orgmanager}"></i>--> <i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':manager.orgmanager,'text-gray':!manager.orgmanager}"></i>
<i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':manager.salesmanager,'text-gray':!manager.salesmanager}"></i> <i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':manager.salesmanager,'text-gray':!manager.salesmanager}"></i>
<!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':manager.datacontent,'text-gray':!manager.datacontent}"></i>--> <!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':manager.datacontent,'text-gray':!manager.datacontent}"></i>-->
</td> </td>

10
src/main/ui/static/config/managers/templates/modify.html
Unescape View File

@ -103,9 +103,9 @@
<label ng-if="('00001'|withRole)"> <label ng-if="('00001'|withRole)">
<input type="checkbox" ng-model="manager.riskmanager" name="riskmanager">Risk Manager <input type="checkbox" ng-model="manager.riskmanager" name="riskmanager">Risk Manager
</label> </label>
<!-- <label ng-if="('00001'|withRole)"> <!-- <label ng-if="('00001'|withRole)">-->
<input type="checkbox" ng-model="manager.orgmanager" name="orgmanager">Org Manager <!-- <input type="checkbox" ng-model="manager.orgmanager" name="orgmanager">Org Manager-->
</label>--> <!-- </label>-->
<label ng-if="('00001'|withRole)"> <label ng-if="('00001'|withRole)">
<input type="checkbox" ng-model="manager.salesmanager" name="salesmanager">Sales Manager <input type="checkbox" ng-model="manager.salesmanager" name="salesmanager">Sales Manager
</label> </label>
@ -120,9 +120,9 @@
<label ng-if="!manager.admin && !manager.operator"> <label ng-if="!manager.admin && !manager.operator">
<input type="checkbox" ng-model="manager.bd" name="bd">BD User <input type="checkbox" ng-model="manager.bd" name="bd">BD User
</label> </label>
<!-- <label ng-if="('00001'|withRole)"> <label ng-if="('00001'|withRole)">
<input type="checkbox" ng-model="manager.orgmanager" name="orgmanager">Org Manager <input type="checkbox" ng-model="manager.orgmanager" name="orgmanager">Org Manager
</label>--> </label>
</p> </p>
</div> </div>
<!-- <div class="form-group" ng-if="('1'|withRole) && !manager.admin && !manager.operator && !manager.sitemanager && orgs!=null"> <!-- <div class="form-group" ng-if="('1'|withRole) && !manager.admin && !manager.operator && !manager.sitemanager && orgs!=null">

4
src/main/ui/static/config/managers/templates/new_manager.html
Unescape View File

@ -129,9 +129,9 @@
<label ng-if="!manager.admin && !manager.operator"> <label ng-if="!manager.admin && !manager.operator">
<input type="checkbox" ng-model="manager.bd" name="bd">BD User <input type="checkbox" ng-model="manager.bd" name="bd">BD User
</label> </label>
<!-- <label ng-if="('00001'|withRole)"> <label ng-if="('00001'|withRole)">
<input type="checkbox" ng-model="manager.orgmanager" name="guest">Org Manager <input type="checkbox" ng-model="manager.orgmanager" name="guest">Org Manager
</label>--> </label>
</p> </p>
</div> </div>

16
src/main/ui/static/config/organizations/templates/org_detail_parent.html
Unescape View File

@ -217,7 +217,7 @@
<label class="control-label col-sm-2" for="commission_type_0">Commission Type *</label> <label class="control-label col-sm-2" for="commission_type_0">Commission Type *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select class="form-control" name="commission_type_0" required ng-model="org.commission_type" id="commission_type_0" <select class="form-control" name="commission_type_0" required ng-model="org.commission_type" id="commission_type_0"
ng-options="commission_type.value as commission_type.label for commission_type in commission_types"> ng-options="commission_type.value as commission_type.label for commission_type in commission_types" disabled>
<option value="">Please Choose</option> <option value="">Please Choose</option>
</select> </select>
</div> </div>
@ -281,10 +281,10 @@
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
<div class="form-group" ng-class="{'has-error':org_form.hf_rate_value.$invalid && org_form.hf_rate_value.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.cb_bankpay_rate_value.$invalid && org_form.cb_bankpay_rate_value.$dirty}">
<label class="control-label col-sm-2" for="hf_rate_value_input">HF Rate *</label> <label class="control-label col-sm-2" for="cb_bankpay_rate_value_input">CBBank Pay Rate *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.hf_rate_value" id="hf_rate_value_input" name="hf_rate_value" max="100" min="0" readonly> <input class="form-control form-control-float" type="number" ng-model="org.cb_bankpay_rate_value" id="cb_bankpay_rate_value_input" name="cb_bankpay_rate_value" max="100" min="0" readonly>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
@ -341,11 +341,11 @@
</div> </div>
<div class="form-group" <div class="form-group"
ng-class="{'has-error':org_form.min_jd_rate.$invalid && org_form.min_jd_rate.$dirty}"> ng-class="{'has-error':org_form.min_cb_bankpay_rate.$invalid && org_form.min_cb_bankpay_rate.$dirty}">
<label class="control-label col-sm-2" for="min_hf_rate_input">Min Jd Rate *</label> <label class="control-label col-sm-2" for="min_cb_bankpay_rate_input">Min CBBank Pay Rate *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.min_hf_rate" <input class="form-control form-control-float" type="number" ng-model="org.min_cb_bankpay_rate"
id="min_hf_rate_input" name="min_jd_rate" max="100" min="0" readonly> id="min_cb_bankpay_rate_input" name="min_cb_bankpay_rate" max="100" min="0" readonly>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>

6
src/main/ui/static/config/sysconfigs/templates/func_info_edit.html
Unescape View File

@ -49,9 +49,9 @@
<label ng-if="('00001'|withRole)"> <label ng-if="('00001'|withRole)">
<input type="checkbox" ng-model="func.riskmanager" name="riskmanager">Risk Manager <input type="checkbox" ng-model="func.riskmanager" name="riskmanager">Risk Manager
</label> </label>
<!-- <label ng-if="('00001'|withRole)"> <label ng-if="('00001'|withRole)">
<input type="checkbox" ng-model="manager.orgmanager" name="orgmanager">Org Manager <input type="checkbox" ng-model="func.orgmanager" name="orgmanager">Org Manager
</label>--> </label>
<label ng-if="('00001'|withRole)"> <label ng-if="('00001'|withRole)">
<input type="checkbox" ng-model="func.salesmanager" name="salesmanager">Sales Manager <input type="checkbox" ng-model="func.salesmanager" name="salesmanager">Sales Manager
</label> </label>

8
src/main/ui/static/config/sysconfigs/templates/permission_config.html
Unescape View File

@ -79,10 +79,10 @@
<i class="fa fa-tripadvisor"></i> <i class="fa fa-tripadvisor"></i>
GUEST GUEST
</a> </a>
<!--<a class="btn btn-app" role="button" ng-click="authorizeRole('1000000000000')">--> <a class="btn btn-app" ng-class="{'isSelect':role=='1000000000000'}" role="button" ng-click="authorizeRole('1000000000000')">
<!--<i class="fa fa-user-plus"></i>--> <i class="fa fa-user-plus"></i>
<!--Org Manager--> Org Manager
<!--</a>--> </a>
<a class="btn btn-app" ng-class="{'isSelect':role=='10000000000000'}" role="button" ng-click="authorizeRole('10000000000000')"> <a class="btn btn-app" ng-class="{'isSelect':role=='10000000000000'}" role="button" ng-click="authorizeRole('10000000000000')">
<i class="fa fa-ticket"></i> <i class="fa fa-ticket"></i>
Sales Manager Sales Manager

4
src/main/ui/static/config/sysconfigs/templates/permission_functions.html
Unescape View File

@ -36,7 +36,7 @@
<i class="fa fa-male" title="BD Leader" ng-class="{'text-green':func.bdleader,'text-gray':!func.bdleader}"></i> <i class="fa fa-male" title="BD Leader" ng-class="{'text-green':func.bdleader,'text-gray':!func.bdleader}"></i>
<i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':func.riskmanager,'text-gray':!func.riskmanager}"></i> <i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':func.riskmanager,'text-gray':!func.riskmanager}"></i>
<i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':func.guest,'text-gray':!func.guest}"></i> <i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':func.guest,'text-gray':!func.guest}"></i>
<!--<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>--> <i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>
<i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':func.salesmanager,'text-gray':!func.salesmanager}"></i> <i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':func.salesmanager,'text-gray':!func.salesmanager}"></i>
<!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>--> <!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>-->
</td> </td>
@ -64,7 +64,7 @@
<i class="fa fa-male" title="BD Leader" ng-class="{'text-green':func.bdleader,'text-gray':!func.bdleader}"></i> <i class="fa fa-male" title="BD Leader" ng-class="{'text-green':func.bdleader,'text-gray':!func.bdleader}"></i>
<i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':func.riskmanager,'text-gray':!func.riskmanager}"></i> <i class="fa fa-user" title="Risk Manager" ng-class="{'text-green':func.riskmanager,'text-gray':!func.riskmanager}"></i>
<i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':func.guest,'text-gray':!func.guest}"></i> <i class="fa fa-tripadvisor" title="GUEST" ng-class="{'text-green':func.guest,'text-gray':!func.guest}"></i>
<!--<i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>--> <i class="fa fa-user-plus" title="Org Manager" ng-class="{'text-green':func.orgmanager,'text-gray':!func.orgmanager}"></i>
<i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':func.salesmanager,'text-gray':!func.salesmanager}"></i> <i class="fa fa-ticket" title="Sales Manager" ng-class="{'text-green':func.salesmanager,'text-gray':!func.salesmanager}"></i>
<!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>--> <!--<i class="fa fa-save" title="Data Content" ng-class="{'text-green':func.datacontent,'text-gray':!func.datacontent}"></i>-->
</td> </td>

3
src/main/ui/static/menu/managerMenu.js
Unescape View File

@ -44,6 +44,9 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
case "guest": case "guest":
rolenum = 2048; rolenum = 2048;
break; break;
case "orgmanager":
rolenum = 4096;
break;
case "riskmanager": case "riskmanager":
rolenum = 1024; rolenum = 1024;
break; break;

9
src/main/ui/static/menu/templates/home.html
Unescape View File

@ -153,6 +153,15 @@
</a> </a>
</div> </div>
<div class="box-items col-sm-3 col-xs-6" ng-if="'1000000000000'|withRole">
<a ng-click="headerShow('orgmanager')" ui-sref="listMenu()" ui-sref-opts="{reload:true}">
<div class="boxs">
<img src="/static/images/manage/menu_7.png">
</div>
<p class="box-font">代理商中心</p>
</a>
</div>
<!--<div class="box-items" ng-if="'1000000'|withRole">--> <!--<div class="box-items" ng-if="'1000000'|withRole">-->
<!--<a ng-click="headerShow()" ui-sref="listMenu()" ui-sref-opts="{reload:true}">--> <!--<a ng-click="headerShow()" ui-sref="listMenu()" ui-sref-opts="{reload:true}">-->
<!--<div class="boxs">--> <!--<div class="boxs">-->

61
src/main/ui/static/menu/templates/main_menu.html
Unescape View File

@ -71,7 +71,7 @@
<!--</div>--> <!--</div>-->
<!--</a>--> <!--</a>-->
<!--</div>--> <!--</div>-->
<div ng-if="'partner_analysis'|withModule" class="col-sm-2 col-xs-6"> <div ng-if="('partner_analysis'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)" class="col-sm-2 col-xs-6">
<a ui-sref="partners_analysis" ui-sref-opts="{reload:true}"> <a ui-sref="partners_analysis" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/merchant_statistics.png"/> <img src="/static/images/main_menu/merchant_statistics.png"/>
@ -81,7 +81,7 @@
</div> </div>
</a> </a>
</div> </div>
<div ng-if="'clientrate'|withModule" class="col-sm-2 col-xs-6"> <div ng-if="('clientrate'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/merchant_activity_1.png"/> <img src="/static/images/main_menu/merchant_activity_1.png"/>
@ -91,7 +91,7 @@
</div> </div>
</a> </a>
</div> </div>
<div ng-if="('merchantAmount'|withModule)" class="col-sm-2 col-xs-6"> <div ng-if="('merchantAmount'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)" class="col-sm-2 col-xs-6">
<a ui-sref="merchantAmountAnalysis" ui-sref-opts="{reload:true}"> <a ui-sref="merchantAmountAnalysis" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/merchant_turnover.png"/> <img src="/static/images/main_menu/merchant_turnover.png"/>
@ -113,7 +113,7 @@
</div>--> </div>-->
</div> </div>
</div> </div>
<div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer'"> <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='orgmanager'">
<div class="row"> <div class="row">
<div class="col-sm-2 col-lg-2 col-xs-6" id="transaction"> <div class="col-sm-2 col-lg-2 col-xs-6" id="transaction">
<div class="description-block"> <div class="description-block">
@ -132,7 +132,7 @@
</div> </div>
</a> </a>
</div> </div>
<div ng-if="('transAnalysis'|withModule)" class="col-sm-2 col-xs-6"> <div ng-if="('transAnalysis'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_transanalysis" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_transanalysis" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/transaction_original_statistics.png"/> <img src="/static/images/main_menu/transaction_original_statistics.png"/>
@ -142,7 +142,7 @@
</div> </div>
</a> </a>
</div> </div>
<div ng-if="('dashboard'|withModule)" class="col-sm-2 col-xs-6"> <div ng-if="('dashboard'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_gateway" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_gateway" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/transaction_original_statistics.png"/> <img src="/static/images/main_menu/transaction_original_statistics.png"/>
@ -152,7 +152,7 @@
</div> </div>
</a> </a>
</div> </div>
<div ng-if="('refundAnalysisApp'|withModule)" class="col-sm-2 col-xs-6"> <div ng-if="('refundAnalysisApp'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_refundAnalysis" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_refundAnalysis" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/transaction_original_statistics.png"/> <img src="/static/images/main_menu/transaction_original_statistics.png"/>
@ -162,7 +162,7 @@
</div> </div>
</a> </a>
</div> </div>
<div ng-if="('channels_Analysis'|withModule)" class="col-sm-2 col-xs-6"> <div ng-if="('channels_Analysis'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_channelsAnalysis" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_channelsAnalysis" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/transaction_original_statistics.png"/> <img src="/static/images/main_menu/transaction_original_statistics.png"/>
@ -195,7 +195,7 @@
</div> </div>
</div> </div>
<div class="list-group" ng-if="role=='riskmanager'"> <div class="list-group" ng-if="role=='riskmanager'">
<div class="row"> <div class="row" ng-if="(currentUser.org_id==null || currentUser.org_id==1)">
<div class="col-sm-2 col-lg-2 col-xs-6" id="risk"> <div class="col-sm-2 col-lg-2 col-xs-6" id="risk">
<div class="description-block"> <div class="description-block">
<label>风控管理</label> <label>风控管理</label>
@ -252,7 +252,7 @@
</div> </div>
</a> </a>
</div> </div>
<div class="col-sm-2 col-xs-6"> <div class="col-sm-2 col-xs-6" ng-if="(currentUser.org_id==null || currentUser.org_id==1)">
<a ui-sref="analysis_monitoring.risk_business" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_monitoring.risk_business" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/risk_log.png"/> <img src="/static/images/main_menu/risk_log.png"/>
@ -481,7 +481,7 @@
</div> </div>
</div> </div>
<div class="list-group" ng-if="role=='bduser' || role=='salesmanager' || role=='director'"> <div class="list-group" ng-if="role=='bduser' || role=='salesmanager' || role=='director'">
<div class="row" ng-if="('1000'|withRole)|| ('bdsale'|withModule) || ('bdprize'|withModule)"> <div class="row" ng-if="(('1000'|withRole)|| ('bdsale'|withModule) || ('bdprize'|withModule)) && (currentUser.org_id==null || currentUser.org_id==1)">
<div class="col-sm-2 col-lg-2 col-xs-6" id="bd"> <div class="col-sm-2 col-lg-2 col-xs-6" id="bd">
<div class="description-block"> <div class="description-block">
<label>绩效管理</label> <label>绩效管理</label>
@ -489,7 +489,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div ng-if="'bdsale'|withModule" class="col-sm-2 col-xs-6"> <div ng-if="('bdsale'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_bd.bdanalysis" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_bd.bdanalysis" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/bd_sales_volume.png"/> <img src="/static/images/main_menu/bd_sales_volume.png"/>
@ -539,7 +539,7 @@
</div> </div>
</a> </a>
</div> </div>
<div ng-if="'clientrate'|withModule" class="col-sm-2 col-xs-6"> <div ng-if="('clientrate'|withModule) && (currentUser.org_id==null || currentUser.org_id==1)" class="col-sm-2 col-xs-6">
<a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}"> <a ui-sref="analysis_monitoring.client_rates" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/bd_merchant_activity.png"/> <img src="/static/images/main_menu/bd_merchant_activity.png"/>
@ -560,7 +560,7 @@
</div> </div>
</div> </div>
<div class="list-group" ng-if="'100'|withRole"> <div class="list-group" ng-if="('100'|withRole) && (currentUser.org_id==null || currentUser.org_id==1)">
<div class="row" ng-if="'100'|withRole"> <div class="row" ng-if="'100'|withRole">
<div class="col-sm-2 col-lg-2 col-xs-6"> <div class="col-sm-2 col-lg-2 col-xs-6">
<div class="description-block"> <div class="description-block">
@ -1071,7 +1071,7 @@
</div> </div>
</div> </div>
</div> </div>
<div ng-if="('1000000000000'|withRole)" class="list-group"> <div ng-if="('1000000000000'|withRole) && role=='orgmanager'" class="list-group">
<div class="row"> <div class="row">
<div class="col-sm-2 col-lg-2 col-xs-6"> <div class="col-sm-2 col-lg-2 col-xs-6">
<div class="description-block"> <div class="description-block">
@ -1080,17 +1080,38 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div ng-if="('1000000000000'|withRole)" class="col-sm-2 col-xs-6"> <div class="col-sm-2 col-xs-6">
<a ui-sref="analysis_agent" ui-sref-opts="{reload:true}"> <a ui-sref="organizations" ui-sref-opts="{reload:true}">
<div class="description-block"> <div class="description-block">
<img src="/static/images/main_menu/logon_log.png"/> <img src="/static/images/main_menu/org_management.png"/>
<div class="description-text"> <div class="description-text">
<span class="description-text">机构数据分析</span> <span class="description-text">组织管理</span>
</div> </div>
</div> </div>
</a></div> </a>
</div>
</div> </div>
</div> </div>
<!-- <div ng-if="('1000000000000'|withRole)" class="list-group">-->
<!-- <div class="row">-->
<!-- <div class="col-sm-2 col-lg-2 col-xs-6">-->
<!-- <div class="description-block">-->
<!-- <label>机构管理</label>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="row">-->
<!-- <div ng-if="('1000000000000'|withRole)" class="col-sm-2 col-xs-6">-->
<!-- <a ui-sref="analysis_agent" ui-sref-opts="{reload:true}">-->
<!-- <div class="description-block">-->
<!-- <img src="/static/images/main_menu/logon_log.png"/>-->
<!-- <div class="description-text">-->
<!-- <span class="description-text">机构数据分析</span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </a></div>-->
<!-- </div>-->
<!-- </div>-->
</div> </div>
</div> </div>
<!-- /.content-wrapper --> <!-- /.content-wrapper -->

Write Preview
Loading…
Cancel
Save