Merge branch 'andriodReleaseNote' into develop

# Conflicts:
#	src/db/modify.sql
master
wangning 7 years ago
commit c1dff4cb09

@ -185,3 +185,26 @@ 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 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:收益比例'; 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'
);

@ -953,9 +953,9 @@ public class RetailAppServiceImp implements RetailAppService {
String version = device.getString("version"); String version = device.getString("version");
String clientType = device.getString("client_type"); String clientType = device.getString("client_type");
deviceSupport.findRegister(clientType); deviceSupport.findRegister(clientType);
String newAppVersion = PlatformEnvironment.getEnv().getNewVersion(); String newAppVersion = PlatformEnvironment.getEnv().getNewVersion(clientType);
Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate(); Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate(clientType);
String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent(); String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent(clientType);
int update_type = 0;// 0:不更新 1更新 2强制更新 int update_type = 0;// 0:不更新 1更新 2强制更新
if (newAppVersion.compareToIgnoreCase(version) > 0) { if (newAppVersion.compareToIgnoreCase(version) > 0) {
update_type = 1; update_type = 1;

@ -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.manage.permission.manager.ManagerMapping;
import au.com.royalpay.payment.tools.env.SysConfigManager; import au.com.royalpay.payment.tools.env.SysConfigManager;
import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
import com.alibaba.fastjson.JSONObject; 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 java.util.List;
import javax.annotation.Resource;
/** /**
* Created by yixian on 2017-01-06. * Created by yixian on 2017-01-06.
*/ */
@ -40,4 +47,9 @@ public class SysConfigController {
public void updateMonthClearDays(@PathVariable String monthPattern, @RequestBody List<String> days) { public void updateMonthClearDays(@PathVariable String monthPattern, @RequestBody List<String> days) {
clearDateManager.setMonthClearDays(monthPattern, days); clearDateManager.setMonthClearDays(monthPattern, days);
} }
public static void main(String[] args) {
System.out.println("asd".equals(null));
}
} }

@ -45,6 +45,7 @@ define(['angular', 'uiRouter'], function (angular) {
$scope.sysconfig = resp.data; $scope.sysconfig = resp.data;
$scope.sysconfig.refund_audit = resp.data.refund_audit=='true'; $scope.sysconfig.refund_audit = resp.data.refund_audit=='true';
$scope.sysconfig.app_update = resp.data.app_update=='true'; $scope.sysconfig.app_update = resp.data.app_update=='true';
$scope.sysconfig.android_update = resp.data.android_update=='true';
}) })
}; };
$scope.loadSysConfigs(); $scope.loadSysConfigs();

@ -90,6 +90,29 @@
<textarea id="app_version_content" placeholder="更新内容" class="form-control" ng-model="sysconfig.app_version_content"></textarea> <textarea id="app_version_content" placeholder="更新内容" class="form-control" ng-model="sysconfig.app_version_content"></textarea>
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label col-sm-3" for="android_version">Android Version</label>
<div class="col-sm-4">
<input id="android_version" class="form-control" ng-model="sysconfig.android_version">
</div>
<div class="col-sm-3">
<div class="checkbox-inline check-box">
<label>
<input id="android_update" type="checkbox" ng-model="sysconfig.android_update">
强制更新
</label>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3" for="android_version_content"></label>
<div class="col-sm-7">
<textarea id="android_version_content" placeholder="更新内容" class="form-control" ng-model="sysconfig.android_version_content"></textarea>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-3" for="clearing_day_id">Max Customer Surcharge Rate</label> <label class="control-label col-sm-3" for="clearing_day_id">Max Customer Surcharge Rate</label>
<div class="col-sm-7"> <div class="col-sm-7">

Loading…
Cancel
Save