From f88ada4a206c4a1e6a7307cd0d820a797d8be73d Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Tue, 16 Jan 2018 11:32:06 +0800 Subject: [PATCH] andriod Release note --- src/db/modify.sql | 22 ++++++++++++++++++ .../core/impls/RetailAppServiceImp.java | 6 ++--- .../sysconfig/web/SysConfigController.java | 16 +++++++++++-- .../ui/static/config/sysconfigs/sysconfigs.js | 1 + .../config/sysconfigs/templates/basic.html | 23 +++++++++++++++++++ 5 files changed, 63 insertions(+), 5 deletions(-) diff --git a/src/db/modify.sql b/src/db/modify.sql index e67bdfd22..f95921fd7 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -146,3 +146,25 @@ ALTER TABLE sys_org ADD COLUMN min_bestpay_rate DECIMAL(3,2) DEFAULT 'NULL' COMM ALTER TABLE sys_org ADD COLUMN min_jd_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低京东费率'; ALTER TABLE sys_org 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' + ); \ 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 f01490ced..c600744ea 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 @@ -953,9 +953,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/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 @@ + + +
+ +
+ +
+
+
+ +
+
+
+
+ +
+ +
+
+