diff --git a/src/db/modify.sql b/src/db/modify.sql
index 41c6cf7c8..38eeb394e 100644
--- a/src/db/modify.sql
+++ b/src/db/modify.sql
@@ -185,3 +185,25 @@ CREATE TABLE `financial_agent_commission_detail` (
alter table financial_partner_commission add column commission_type smallint(1) DEFAULT 1 COMMENT '提成类型 1:渠道计算法 2:总交易额比例 3:收益比例';
alter table financial_partner_commission_detail add column commission_type smallint(1) DEFAULT 1 COMMENT '提成类型 1:渠道计算法 2:总交易额比例 3:收益比例';
+INSERT INTO `royalpay_production`.`sys_configs`(`config_key` , `config_value`)
+
+
+VALUES
+ (
+ 'android_version_content' ,
+ '近期更新:\n\n1、修复了付款二维码的保存可能会失败的错误\n2、新增多种渠道订单及清算\n3、修复清算记录显示错误'
+ );
+
+INSERT INTO `royalpay_production`.`sys_configs`(`config_key` , `config_value`)
+VALUES
+ (
+ 'android_version' ,
+ '2.8.1'
+ );
+
+INSERT INTO `royalpay_production`.`sys_configs`(`config_key` , `config_value`)
+VALUES
+ (
+ 'android_update' ,
+ 'true'
+ );
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/ClientRatesAnalysisService.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/ClientRatesAnalysisService.java
index 02ead9905..7b5343f6e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/ClientRatesAnalysisService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/ClientRatesAnalysisService.java
@@ -8,7 +8,7 @@ import java.util.Date;
* Created by yixian on 2016-11-08.
*/
public interface ClientRatesAnalysisService {
- JSONObject listAnalysisOfBDUsers(JSONObject manager, Integer orgId, Date beginDate, Date endDate);
+ JSONObject listAnalysisOfBDUsers(JSONObject manager, String orgId,String orgIds, Date beginDate, Date endDate);
JSONObject listAllClientRates(Integer orgId, ClientRateQueryBean query);
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/OrgAnalysisService.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/OrgAnalysisService.java
index e2b453fbc..4e8faebf2 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/OrgAnalysisService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/OrgAnalysisService.java
@@ -8,7 +8,7 @@ import java.util.List;
* Created by yishuqian on 27/02/2017.
*/
public interface OrgAnalysisService {
- List getSalesAnalysis(JSONObject params);
+ List getSalesAnalysis(JSONObject params,JSONObject manager);
List getPartnersSaleByOrgId(JSONObject params);
}
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ClientRatesAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ClientRatesAnalysisServiceImpl.java
index cb87bae94..3d77137d3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ClientRatesAnalysisServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ClientRatesAnalysisServiceImpl.java
@@ -6,11 +6,13 @@ import au.com.royalpay.payment.manage.analysis.mappers.ClientRatesAnalysisMapper
import au.com.royalpay.payment.manage.mappers.log.ClientReviewLogMapper;
import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
import au.com.royalpay.payment.manage.merchants.core.ClientManager;
+import au.com.royalpay.payment.manage.organizations.core.OrgManager;
import au.com.royalpay.payment.tools.exceptions.BadRequestException;
import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,20 +42,25 @@ public class ClientRatesAnalysisServiceImpl implements ClientRatesAnalysisServic
@Autowired(required = false)
private ClientRateAnalysisEventLoader[] eventLoaders;
+ @Resource
+ private OrgManager orgManager;
+
@Override
- public JSONObject listAnalysisOfBDUsers(JSONObject manager, Integer orgId, Date beginDate, Date endDate) {
- if (manager.getIntValue("org_id") > 0) {
- orgId = manager.getInteger("org_id");
- }
+ public JSONObject listAnalysisOfBDUsers(JSONObject manager, String orgId, String orgIds,Date beginDate, Date endDate) {
JSONObject params = new JSONObject();
if (orgId != null) {
params.put("org_id", orgId);
}
+ if (StringUtils.isNotEmpty(orgIds)) {
+ params.put("org_ids", orgIds);
+ }
+
if (ManagerRole.BD_LEADER.hasRole(manager.getIntValue("role"))) {
params.put("bd_group", manager.getString("manager_id"));
}
params.put("begin", beginDate);
params.put("end", endDate);
+ orgManager.checkOrgIds(manager,params);
JSONObject result = new JSONObject();
List bdAnalysis = clientRatesAnalysisMapper.analysisRatesForBDUsers(params);
result.put("bds", bdAnalysis);
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java
index ecc4dcf02..66510785d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java
@@ -2,6 +2,7 @@ package au.com.royalpay.payment.manage.analysis.core.impls;
import au.com.royalpay.payment.manage.analysis.core.OrgAnalysisService;
import au.com.royalpay.payment.manage.analysis.mappers.TransactionAnalysisMapper;
+import au.com.royalpay.payment.manage.organizations.core.OrgManager;
import com.alibaba.fastjson.JSONObject;
import org.springframework.stereotype.Service;
@@ -16,9 +17,14 @@ public class OrgAnalysisServiceImp implements OrgAnalysisService {
@Resource
private TransactionAnalysisMapper transactionAnalysisMapper;
+ @Resource
+ private OrgManager orgManager;
+
@Override
- public List getSalesAnalysis(JSONObject params) {
- return transactionAnalysisMapper.getOrgTransactionAnalysis(params);
+ public List getSalesAnalysis(JSONObject params,JSONObject manager) {
+ orgManager.checkOrgIds(manager,params);
+ List OrgTransaction = transactionAnalysisMapper.getOrgTransactionAnalysis(params);
+ return OrgTransaction;
}
@Override
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/ClientRatesController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/ClientRatesController.java
index 12c15b9d2..8178181c8 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/ClientRatesController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/ClientRatesController.java
@@ -34,7 +34,8 @@ public class ClientRatesController {
@RequestMapping("/bd_users")
public JSONObject listAnalysisOfBDUsers(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,
- @RequestParam(name = "org_id", required = false) Integer orgId,
+ @RequestParam(name = "org_id", required = false) String orgId,
+ @RequestParam(name = "org_ids", required = false) String orgIds,
@RequestParam String begin, @RequestParam String end) {
Date beginDate;
try {
@@ -48,7 +49,7 @@ public class ClientRatesController {
} catch (ParseException e) {
throw new ParamInvalidException("end", "error.payment.valid.invalid_date_format");
}
- return clientRatesAnalysisService.listAnalysisOfBDUsers(manager, orgId, beginDate, endDate);
+ return clientRatesAnalysisService.listAnalysisOfBDUsers(manager,orgId, orgIds, beginDate, endDate);
}
@RequestMapping("/orgs/all")
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/OrgSaleAnalysisController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/OrgSaleAnalysisController.java
index 4b333a878..17ef61598 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/OrgSaleAnalysisController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/OrgSaleAnalysisController.java
@@ -23,7 +23,7 @@ public class OrgSaleAnalysisController {
@ManagerMapping(value = "/sales",role = {ManagerRole.DIRECTOR,ManagerRole.OPERATOR,ManagerRole.ADMIN,ManagerRole.FINANCIAL_STAFF})
public List getSalesAnalysis(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
JSONObject params = analysis.toParams(null);
- return orgAnalysisService.getSalesAnalysis(params);
+ return orgAnalysisService.getSalesAnalysis(params,manager);
}
@ManagerMapping(value = "/{org_id}/partners",role = {ManagerRole.DIRECTOR,ManagerRole.OPERATOR,ManagerRole.ADMIN,ManagerRole.FINANCIAL_STAFF})
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 f01490ced..35cc8f890 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
@@ -777,6 +777,7 @@ public class RetailAppServiceImp implements RetailAppService {
String clientType = device.getString("client_type");
deviceSupport.findRegister(clientType);
JSONObject res = noticeManage.getNoticeById(noticeId);
+ res.remove("status");
Document doc = Jsoup.parse(res.getString("content"));
String father = "";
String html = doc.body().children().wrap(father).html();
@@ -953,9 +954,9 @@ public class RetailAppServiceImp implements RetailAppService {
String version = device.getString("version");
String clientType = device.getString("client_type");
deviceSupport.findRegister(clientType);
- String newAppVersion = PlatformEnvironment.getEnv().getNewVersion();
- Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate();
- String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent();
+ String newAppVersion = PlatformEnvironment.getEnv().getNewVersion(clientType);
+ Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate(clientType);
+ String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent(clientType);
int update_type = 0;// 0:不更新 1:更新 2:强制更新
if (newAppVersion.compareToIgnoreCase(version) > 0) {
update_type = 1;
diff --git a/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/web/SysConfigController.java b/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/web/SysConfigController.java
index cee5b6558..6aaea6373 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/web/SysConfigController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/sysconfig/web/SysConfigController.java
@@ -4,12 +4,19 @@ import au.com.royalpay.payment.manage.management.sysconfig.core.ClearDateManager
import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
import au.com.royalpay.payment.tools.env.SysConfigManager;
import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
+
import com.alibaba.fastjson.JSONObject;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
import java.util.List;
+import javax.annotation.Resource;
+
/**
* Created by yixian on 2017-01-06.
*/
@@ -40,4 +47,9 @@ public class SysConfigController {
public void updateMonthClearDays(@PathVariable String monthPattern, @RequestBody List days) {
clearDateManager.setMonthClearDays(monthPattern, days);
}
+
+
+ public static void main(String[] args) {
+ System.out.println("asd".equals(null));
+ }
}
diff --git a/src/main/java/au/com/royalpay/payment/manage/organizations/core/OrgManager.java b/src/main/java/au/com/royalpay/payment/manage/organizations/core/OrgManager.java
index d3f35d221..d1f3778ca 100644
--- a/src/main/java/au/com/royalpay/payment/manage/organizations/core/OrgManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/organizations/core/OrgManager.java
@@ -28,4 +28,6 @@ public interface OrgManager {
List listAllOrg();
JSONObject checkOrg(JSONObject manager, JSONObject params);
+
+ JSONObject checkOrgIds(JSONObject manager, JSONObject params);
}
diff --git a/src/main/java/au/com/royalpay/payment/manage/organizations/core/impls/OrgManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/organizations/core/impls/OrgManagerImpl.java
index 48a024f35..d68b1a2f2 100644
--- a/src/main/java/au/com/royalpay/payment/manage/organizations/core/impls/OrgManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/organizations/core/impls/OrgManagerImpl.java
@@ -149,4 +149,41 @@ public class OrgManagerImpl implements OrgManager {
return params;
}
+ @Override
+ public JSONObject checkOrgIds(JSONObject manager, JSONObject params) {
+ if(params.getString("org_id") != null){
+ if(params.getString("org_ids") == null){
+ orgIds(params,manager);
+ }else {
+ params.put("org_id",params.getString("org_ids"));
+ params.remove("org_ids");
+ }
+ }else {
+ if(params.getString("org_ids") == null){
+ if(manager.getIntValue("org_id") > 0){
+ List orgs = orgMapper.listOrgAndChild(manager.getIntValue("org_id"));
+ if (orgs.size()>1){
+ List orgIds = orgs.stream().map(org->org.getIntValue("org_id")).collect(Collectors.toList());
+ params.put("org_ids",orgIds);
+ }else {
+ params.put("org_id",manager.getIntValue("org_id"));
+ }
+ }
+ }else {
+ params.put("org_id",params.getString("org_ids"));
+ params.remove("org_ids");
+ }
+ }
+ return params;
+ }
+ private void orgIds(JSONObject params,JSONObject manager){
+ List orgs = orgMapper.listOrgAndChild(Integer.parseInt(params.getString("org_id")));
+ if (orgs.size()>1){
+ List orgIds = orgs.stream().map(org->org.getIntValue("org_id")).collect(Collectors.toList());
+ params.put("org_ids",orgIds);
+ params.remove("org_id");
+ }else {
+ params.put("org_id",params.getString("org_id"));
+ }
+ }
}
diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java
index d21fded04..f3c271886 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java
@@ -37,6 +37,7 @@ public class TradeLogQuery {
private boolean onlyGroup = false;
private int group_bd;
private String org_id;
+ private String org_ids;
public JSONObject toParams(String timezone) {
JSONObject params = new JSONObject();
@@ -95,6 +96,10 @@ public class TradeLogQuery {
if (org_id != null && org_id != "ALL") {
params.put("org_id", org_id);
}
+
+ if (StringUtils.isNotEmpty(org_ids)) {
+ params.put("org_ids", org_ids);
+ }
return params;
}
@@ -226,4 +231,12 @@ public class TradeLogQuery {
public void setOrg_id(String org_id) {
this.org_id = org_id;
}
+
+ public String getOrg_ids() {
+ return org_ids;
+ }
+
+ public void setOrg_ids(String org_ids) {
+ this.org_ids = org_ids;
+ }
}
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 4f2ab89ab..00df0f5a2 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
@@ -170,7 +170,7 @@ public class TradeLogServiceImpl implements TradeLogService {
@Override
public JSONObject listAllTradeLogs(TradeLogQuery query, JSONObject manager) {
JSONObject params = query.toParams(null);
- if (ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) {
+ if (ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))&& !ManagerRole.ORG_MANAGER.hasRole(manager.getIntValue("role"))) {
params.put("bd_user", manager.getString("manager_id"));
}
if (query.isOnlyGroup() && ManagerRole.BD_LEADER.hasRole(manager.getIntValue("role"))) {
@@ -180,7 +180,7 @@ public class TradeLogServiceImpl implements TradeLogService {
params.put("bd_group_bd", query.getGroup_bd());
}
}
- orgManager.checkOrg(manager,params);
+ orgManager.checkOrgIds(manager,params);
PageList logs = orderMapper.listOrders(params, new PageBounds(query.getPage(), query.getLimit(), Order.formString("create_time.desc")));
JSONObject result = PageListUtils.buildPageListResult(logs);
JSONObject analysis = orderMapper.analysisOrders(params);
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
index 078381401..9f9ec40fb 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
@@ -651,6 +651,9 @@
]]>
and t.transaction_time >= #{begin}
and t.transaction_time <= #{end}
+ and o.org_id=#{org_id}
+ and o.org_id in
+ #{org_id}
GROUP BY o.org_id order by amount desc
diff --git a/src/main/resources/templates/mail/settlement_mail.html b/src/main/resources/templates/mail/settlement_mail.html
index cdf158df8..2646fe311 100644
--- a/src/main/resources/templates/mail/settlement_mail.html
+++ b/src/main/resources/templates/mail/settlement_mail.html
@@ -13,7 +13,7 @@
Representative of AFS Licensee 448066
------------------------------
Lv.11,15 William Street, Melbourne 3000
- Lv.7, 50 Bridge Street, Sydney, NSW 2000
+ Lv.14, 383 Kent Street, Sydney, NSW 2000
P: 1300 1077 50
E: settlement@royalpay.com.au
www.royalpay.com.au
diff --git a/src/main/resources/templates/reports/week_report.html b/src/main/resources/templates/reports/week_report.html
index e3bcd0070..77151318c 100644
--- a/src/main/resources/templates/reports/week_report.html
+++ b/src/main/resources/templates/reports/week_report.html
@@ -151,8 +151,6 @@
- #end
-
@@ -167,12 +165,12 @@
+ th:text="'↑'+${report.transaction_report.sydney.thisweek.compare.value}">
+ th:text="'↓'+${report.transaction_report.sydney.thisweek.compare.value}">
+ th:text="${report.transaction_report.sydney.thisweek.compare.value}">
@@ -226,51 +224,6 @@
-
-
新增商户情况(Melbourne)
-
-
-
-
-
商家自主申请情况
diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 6a92c506b..ab8e0d12a 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -357,7 +357,7 @@ margin-bottom: 10%;"/>
+ ng-if="('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole))||('orgcommission'|withModule)">
合伙人|Partners Analysis
diff --git a/src/main/ui/partner_register.html b/src/main/ui/partner_register.html
index 3a5dc375a..92e7be85a 100644
--- a/src/main/ui/partner_register.html
+++ b/src/main/ui/partner_register.html
@@ -564,8 +564,8 @@
-
diff --git a/src/main/ui/static/config/organizations/templates/org_detail.html b/src/main/ui/static/config/organizations/templates/org_detail.html
index 740de3528..410f0b0f6 100644
--- a/src/main/ui/static/config/organizations/templates/org_detail.html
+++ b/src/main/ui/static/config/organizations/templates/org_detail.html
@@ -79,7 +79,7 @@
@@ -89,7 +89,7 @@
@@ -98,7 +98,7 @@
@@ -106,7 +106,7 @@
@@ -114,7 +114,7 @@
@@ -122,7 +122,7 @@
@@ -130,7 +130,7 @@
@@ -142,16 +142,18 @@
ng-class="{'has-error':org_form.min_wechat_rate.$invalid && org_form.min_wechat_rate.$dirty}">
-
+
+ %
@@ -159,8 +161,9 @@
ng-class="{'has-error':org_form.min_bestpay_rate.$invalid && org_form.min_bestpay_rate.$dirty}">
-
+
+ %
@@ -168,8 +171,9 @@
ng-class="{'has-error':org_form.min_jd_rate.$invalid && org_form.min_jd_rate.$dirty}">
-
+
+ %
@@ -177,8 +181,9 @@
ng-class="{'has-error':org_form.min_alipayonline_rate.$invalid && org_form.min_alipayonline_rate.$dirty}">
-
+
+ %
diff --git a/src/main/ui/static/config/organizations/templates/org_detail_parent.html b/src/main/ui/static/config/organizations/templates/org_detail_parent.html
index 3f4b23d70..d979c6b2c 100644
--- a/src/main/ui/static/config/organizations/templates/org_detail_parent.html
+++ b/src/main/ui/static/config/organizations/templates/org_detail_parent.html
@@ -216,7 +216,7 @@
@@ -226,7 +226,7 @@
@@ -235,7 +235,7 @@
@@ -243,7 +243,7 @@
@@ -251,7 +251,7 @@
@@ -259,7 +259,7 @@
@@ -267,7 +267,7 @@
@@ -278,16 +278,18 @@
ng-class="{'has-error':org_form.min_wechat_rate.$invalid && org_form.min_wechat_rate.$dirty}">
-
+
+ %
@@ -295,8 +297,9 @@
ng-class="{'has-error':org_form.min_bestpay_rate.$invalid && org_form.min_bestpay_rate.$dirty}">
-
+
+ %
@@ -304,8 +307,9 @@
ng-class="{'has-error':org_form.min_jd_rate.$invalid && org_form.min_jd_rate.$dirty}">
-
+
+ %
@@ -313,8 +317,9 @@
ng-class="{'has-error':org_form.min_alipayonline_rate.$invalid && org_form.min_alipayonline_rate.$dirty}">
-
+
+ %
diff --git a/src/main/ui/static/config/sysconfigs/sysconfigs.js b/src/main/ui/static/config/sysconfigs/sysconfigs.js
index 4c1f3108e..881bba243 100644
--- a/src/main/ui/static/config/sysconfigs/sysconfigs.js
+++ b/src/main/ui/static/config/sysconfigs/sysconfigs.js
@@ -45,6 +45,7 @@ define(['angular', 'uiRouter'], function (angular) {
$scope.sysconfig = resp.data;
$scope.sysconfig.refund_audit = resp.data.refund_audit=='true';
$scope.sysconfig.app_update = resp.data.app_update=='true';
+ $scope.sysconfig.android_update = resp.data.android_update=='true';
})
};
$scope.loadSysConfigs();
diff --git a/src/main/ui/static/config/sysconfigs/templates/basic.html b/src/main/ui/static/config/sysconfigs/templates/basic.html
index fb7a4cb20..4f9af8fa7 100644
--- a/src/main/ui/static/config/sysconfigs/templates/basic.html
+++ b/src/main/ui/static/config/sysconfigs/templates/basic.html
@@ -90,6 +90,29 @@
+
+
+
+
+