From 20200198c81eaba8e8b3ebd48147b3cecd7f3bac Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 20 Feb 2020 15:00:00 +0800 Subject: [PATCH] =?UTF-8?q?add=20app=E5=BC=B9=E7=AA=97=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../app_index/beans/AppActBean.java | 147 +----------------- .../core/impls/RetailAppServiceImp.java | 2 +- .../system/ClientIncrementalMapper.java | 10 +- .../core/impls/ClientManagerImpl.java | 4 +- src/main/ui/login.html | 21 ++- src/main/ui/login_v1.html | 21 ++- src/main/ui/static/actapp/app_act_list.js | 14 +- .../actapp/templates/act_app_detail.html | 111 +------------ 9 files changed, 49 insertions(+), 283 deletions(-) diff --git a/pom.xml b/pom.xml index b3637d803..390b095a9 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.50 + 1.3.51 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java index e02e98e0f..43df823cd 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java @@ -1,10 +1,7 @@ package au.com.royalpay.payment.manage.activities.app_index.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; - -import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import com.alibaba.fastjson.JSONObject; - import org.apache.commons.lang3.time.DateUtils; import java.text.ParseException; @@ -17,52 +14,20 @@ public class AppActBean { private static final String[] DATE_PATTERNS = {"yyyy-MM-dd"}; private String act_name; private String act_url; - private String params_json; private boolean is_valid = true; - private String desc; - private String act_content; private String show_type; - private boolean is_show_window; private String act_img; - private String window_img; private String active_date; private String expire_date; - private String banner_img; - private String msg_start_date; - private String msg_end_date; - private String msg_interval; - private boolean app; - private boolean banner; - private boolean list; public JSONObject toJsonParam(){ JSONObject params = new JSONObject(); params.put("act_name",act_name); params.put("act_url",act_url); - params.put("params_json",params_json); - params.put("desc",desc); - params.put("act_content",act_content); params.put("show_type",show_type); params.put("act_img",act_img); - params.put("window_img",window_img); - params.put("banner_img",banner_img); - params.put("msg_interval",msg_interval); - params.put("is_show_window",is_show_window); params.put("is_valid",is_valid); - params.put("msg_start_date", msg_start_date); - params.put("msg_end_date", msg_end_date); - int show_place = 0; - if (app) { - show_place |= ActAppShowPlaceEnum.App.getPlace(); - } - if (banner) { - show_place |= ActAppShowPlaceEnum.Banner.getPlace(); - } - if (list) { - show_place |= ActAppShowPlaceEnum.List.getPlace(); - } - params.put("show_place", show_place); if (active_date != null) { try { Date fromDate = DateUtils.parseDate(active_date, DATE_PATTERNS); @@ -79,22 +44,6 @@ public class AppActBean { throw new ParamInvalidException("expire_date", "error.payment.valid.invalid_date_format"); } } - if (msg_start_date != null) { - try { - Date fromDate = DateUtils.parseDate(msg_start_date, DATE_PATTERNS); - params.put("msg_start_date", fromDate); - } catch (ParseException e) { - throw new ParamInvalidException("msg_start_date", "error.payment.valid.invalid_date_format"); - } - } - if (msg_end_date != null) { - try { - Date fromDate = DateUtils.parseDate(msg_end_date, DATE_PATTERNS); - params.put("msg_end_date", fromDate); - } catch (ParseException e) { - throw new ParamInvalidException("msg_end_date", "error.payment.valid.invalid_date_format"); - } - } return params; } @@ -114,30 +63,6 @@ public class AppActBean { this.act_url = act_url; } - public String getParams_json() { - return params_json; - } - - public void setParams_json(String params_json) { - this.params_json = params_json; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - - public String getAct_content() { - return act_content; - } - - public void setAct_content(String act_content) { - this.act_content = act_content; - } - public String getAct_img() { return act_img; } @@ -146,14 +71,6 @@ public class AppActBean { this.act_img = act_img; } - public String getWindow_img() { - return window_img; - } - - public void setWindow_img(String window_img) { - this.window_img = window_img; - } - public String getShow_type() { return show_type; } @@ -162,14 +79,6 @@ public class AppActBean { this.show_type = show_type; } - public Boolean getIs_show_window() { - return is_show_window; - } - - public void setIs_show_window(Boolean is_show_window) { - this.is_show_window = is_show_window; - } - public Boolean getIs_valid() { return is_valid; } @@ -194,59 +103,11 @@ public class AppActBean { this.expire_date = expire_date; } - public String getBanner_img() { - return banner_img; - } - - public void setBanner_img(String banner_img) { - this.banner_img = banner_img; - } - - public String getMsg_start_date() { - return msg_start_date; - } - - public void setMsg_start_date(String msg_start_date) { - this.msg_start_date = msg_start_date; - } - - public String getMsg_end_date() { - return msg_end_date; - } - - public void setMsg_end_date(String msg_end_date) { - this.msg_end_date = msg_end_date; - } - - public String getMsg_interval() { - return msg_interval; - } - - public void setMsg_interval(String msg_interval) { - this.msg_interval = msg_interval; - } - - public boolean isApp() { - return app; - } - - public void setApp(boolean app) { - this.app = app; - } - - public boolean isBanner() { - return banner; - } - - public void setBanner(boolean banner) { - this.banner = banner; - } - - public boolean isList() { - return list; + public boolean isIs_valid() { + return is_valid; } - public void setList(boolean list) { - this.list = list; + public void setIs_valid(boolean is_valid) { + this.is_valid = is_valid; } } 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 7bdfa750d..fd01fe480 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 @@ -1595,7 +1595,7 @@ public class RetailAppServiceImp implements RetailAppService { act.put("data", latestAct); act.put("type", "act"); if (StringUtils.equalsIgnoreCase("跨境商城", latestAct.getString("act_name"))) { - JSONObject incrementalInfo = clientIncrementalMapper.findByClinetIdAndChannel(clientId, "RP跨境商城"); + JSONObject incrementalInfo = clientIncrementalMapper.findByClinetIdAndChannelIsValid(clientId, "RP跨境商城"); JSONObject applyInfo = clientServicesApplyMapper.findApplyByClientIdAndChannel(clientId, "RP跨境商城"); if (incrementalInfo == null && applyInfo == null) { result.add(act); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java index 331160b2f..0e237c899 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java @@ -25,6 +25,14 @@ public interface ClientIncrementalMapper { @AutoSql(type = SqlType.SELECT) List findAllByclientMoniker(@Param("client_id") int clientId); + @Select("select ci.*, " + + " si.source_code " + + " from sys_client_incremental ci inner join sys_incremental_channels si " + + " on ci.channel = si.channel" + + " where ci.client_id = #{client_id} " + + " and ci.channel = #{channel} ") + JSONObject findByClinetIdAndChannel(@Param("client_id")int clientId, @Param("channel")String channel); + @Select("select ci.*, " + " si.source_code " + " from sys_client_incremental ci inner join sys_incremental_channels si " + @@ -32,7 +40,7 @@ public interface ClientIncrementalMapper { " where ci.client_id = #{client_id} " + " and ci.channel = #{channel} " + " and ci.is_valid = 1") - JSONObject findByClinetIdAndChannel(@Param("client_id")int clientId, @Param("channel")String channel); + JSONObject findByClinetIdAndChannelIsValid(@Param("client_id")int clientId, @Param("channel")String channel); @AutoSql(type = SqlType.INSERT) void save(JSONObject saveIncrementalService); 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 193220588..027e3ba6d 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 @@ -6492,7 +6492,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (client == null) { throw new InvalidShortIdException(); } - JSONObject incrementalInfo = clientIncrementalMapper.findByClinetIdAndChannel(client.getInteger("client_id"), channel); + JSONObject incrementalInfo = clientIncrementalMapper.findByClinetIdAndChannelIsValid(client.getInteger("client_id"), channel); if(incrementalInfo==null){ throw new BadRequestException("Merchant service not opened"); } @@ -6505,7 +6505,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (client == null) { throw new InvalidShortIdException(); } - JSONObject incrementalInfo = clientIncrementalMapper.findByClinetIdAndChannel(client.getInteger("client_id"), channel); + JSONObject incrementalInfo = clientIncrementalMapper.findByClinetIdAndChannelIsValid(client.getInteger("client_id"), channel); if(incrementalInfo==null){ throw new BadRequestException("Merchant service not opened"); } diff --git a/src/main/ui/login.html b/src/main/ui/login.html index 70be7cfb9..432a0a419 100644 --- a/src/main/ui/login.html +++ b/src/main/ui/login.html @@ -353,14 +353,19 @@ function getGeekSsoLoginUrl() { var url = "http://mch.dev.geekforbest.com/#/sso_login?token="; - $http.get("/client/partner_info/incremental_service/RP跨境商城/login_token").then(function (res) { - url += res.data.token; - window.open(url, '_blank'); - location.href = '/index.html'; - }, function (resp) { - console.log(resp.data.message) - location.href = '/index.html'; - }); + $.ajax({ + url: '/client/partner_info/incremental_service/RP跨境商城/login_token', + method: 'get', + success: function (res) { + url += res.token; + window.open(url, '_blank'); + location.href = '/index.html'; + }, + error: function (resp) { + console.log(resp.message) + location.href = '/index.html'; + } + }) }; $('#forgetPassword-btn').click(function () { diff --git a/src/main/ui/login_v1.html b/src/main/ui/login_v1.html index 2ae787cac..d878eca6d 100644 --- a/src/main/ui/login_v1.html +++ b/src/main/ui/login_v1.html @@ -334,14 +334,19 @@ function getGeekSsoLoginUrl() { var url = "http://mch.dev.geekforbest.com/#/sso_login?token="; - $http.get("/client/partner_info/incremental_service/RP跨境商城/login_token").then(function (res) { - url += res.data.token; - window.open(url, '_blank'); - location.href = '/index.html'; - }, function (resp) { - console.log(resp.data.message) - location.href = '/index.html'; - }); + $.ajax({ + url: '/client/partner_info/incremental_service/RP跨境商城/login_token', + method: 'get', + success: function (res) { + url += res.token; + window.open(url, '_blank'); + location.href = '/index.html'; + }, + error: function (resp) { + console.log(resp.message) + location.href = '/index.html'; + } + }) }; $('#forgetPassword-btn').click(function () { diff --git a/src/main/ui/static/actapp/app_act_list.js b/src/main/ui/static/actapp/app_act_list.js index 95af59c10..126563019 100644 --- a/src/main/ui/static/actapp/app_act_list.js +++ b/src/main/ui/static/actapp/app_act_list.js @@ -65,12 +65,6 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS if ($scope.actDetail.expire_date) { $scope.actDetail.expire_date = $filter('date')($scope.actDetail.expire_date, 'yyyy-MM-dd'); } - if ($scope.actDetail.msg_start_date) { - $scope.actDetail.msg_start_date = $filter('date')($scope.actDetail.msg_start_date, 'yyyy-MM-dd'); - } - if ($scope.actDetail.msg_end_date) { - $scope.actDetail.msg_end_date = $filter('date')($scope.actDetail.msg_end_date, 'yyyy-MM-dd'); - } $http.put('/manager/app/act', $scope.actDetail).then(function (resp) { commonDialog.alert({title: 'Success', content: '新增成功', type: 'success'}); $state.go('^.detail',{act_id:resp.data.act_id},{reload:true}); @@ -97,12 +91,6 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS if ($scope.actDetail.expire_date) { $scope.actDetail.expire_date = $filter('date')($scope.actDetail.expire_date, 'yyyy-MM-dd'); } - if ($scope.actDetail.msg_start_date) { - $scope.actDetail.msg_start_date = $filter('date')($scope.actDetail.msg_start_date, 'yyyy-MM-dd'); - } - if ($scope.actDetail.msg_end_date) { - $scope.actDetail.msg_end_date = $filter('date')($scope.actDetail.msg_end_date, 'yyyy-MM-dd'); - } $http.put('/manager/app/act/' + $scope.actDetail.act_id, $scope.actDetail).then(function (resp) { commonDialog.alert({title: 'Success', content: '修改成功', type: 'success'}); $state.reload(); @@ -112,4 +100,4 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS } }]); return app; -}); \ No newline at end of file +}); diff --git a/src/main/ui/static/actapp/templates/act_app_detail.html b/src/main/ui/static/actapp/templates/act_app_detail.html index 5c2713757..0dfdba7e5 100644 --- a/src/main/ui/static/actapp/templates/act_app_detail.html +++ b/src/main/ui/static/actapp/templates/act_app_detail.html @@ -32,17 +32,6 @@
-
- -
- -
-

Desc is required

-
-
-
@@ -68,28 +57,6 @@
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
@@ -98,81 +65,21 @@ ng-model="actDetail.act_img">
- -
- -
- -
-
-
- -
-
- -
- ~ -
- -
-
-
- -
- -
-
- - H -
-
-
- -
- -
-
-

- - - -

-
-
-
- -
-
+
@@ -180,14 +87,6 @@ ng-model="actDetail.act_url">
-
- -
- -
-
- \ No newline at end of file +