diff --git a/pom.xml b/pom.xml index 92ba279d1..4ab4f0887 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.52 + 1.3.53 UTF-8 1.8.0 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 fd01fe480..8752563ed 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,9 +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.findByClinetIdAndChannelIsValid(clientId, "RP跨境商城"); - JSONObject applyInfo = clientServicesApplyMapper.findApplyByClientIdAndChannel(clientId, "RP跨境商城"); - if (incrementalInfo == null && applyInfo == null) { + if (!clientConfig.getBooleanValue("geek_shop_status")) { result.add(act); } }else { 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 027e3ba6d..c34517638 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 @@ -6469,6 +6469,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid partner.put("lessKycFiles", isPartnerKycfilesComplete(partner.getString("client_moniker"))); partner.put("lessComplianceFiles", signInAccountService.checkAuthFileStatus(partner.getJSONObject("client")).getBoolean("client_less_file")); } + JSONObject clientConfig = clientConfigMapper.find(client.getIntValue("client_id")); + partner.put("geek_shop_status", clientConfig.getBooleanValue("geek_shop_status")); return partner; } @@ -6492,8 +6494,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (client == null) { throw new InvalidShortIdException(); } + JSONObject clientConfig = clientConfigMapper.find(client.getIntValue("client_id")); JSONObject incrementalInfo = clientIncrementalMapper.findByClinetIdAndChannelIsValid(client.getInteger("client_id"), channel); - if(incrementalInfo==null){ + if (!clientConfig.getBooleanValue("geek_shop_status")) { throw new BadRequestException("Merchant service not opened"); } return incrementalInfo; @@ -6505,11 +6508,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (client == null) { throw new InvalidShortIdException(); } - JSONObject incrementalInfo = clientIncrementalMapper.findByClinetIdAndChannelIsValid(client.getInteger("client_id"), channel); - if(incrementalInfo==null){ + JSONObject clientConfig = clientConfigMapper.find(account.getIntValue("client_id")); + if(!clientConfig.getBooleanValue("geek_shop_status")){ throw new BadRequestException("Merchant service not opened"); } - return retailRSvcService.getGeekSsoTokenInfo(incrementalInfo.getString("source_code"),client.getString("client_moniker")); + return retailRSvcService.getGeekSsoTokenInfo("RYCBSM",client.getString("client_moniker")); } @Override diff --git a/src/main/ui/static/incrementalService/partner-incremental-service.js b/src/main/ui/static/incrementalService/partner-incremental-service.js index db41f606c..db3ec66c2 100644 --- a/src/main/ui/static/incrementalService/partner-incremental-service.js +++ b/src/main/ui/static/incrementalService/partner-incremental-service.js @@ -23,7 +23,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { }); }]); - app.controller('partnerIncrementalServiceCtrl', ['$scope', '$http', '$state', 'partner', function ($scope, $http, $state, partner) { + app.controller('partnerIncrementalServiceCtrl', ['$scope', '$http', '$state', 'partner', '$stateParams' , function ($scope, $http, $state, partner,$stateParams) { $scope.serviceAll = []; $scope.channelOptions = []; $scope.windowHeight = document.body.clientWidth; @@ -41,6 +41,18 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { }) } + + $scope.getGeekSsoLoginUrl = function () { + 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'); + }, function (resp) { + console.log(resp.data.message) + window.open("https://mch.geekforbest.com/#/login", '_blank'); + }); + }; + $scope.CheckImgExists =function (url) { var xmlHttp ; if (window.ActiveXObject) @@ -67,8 +79,15 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { $scope.initDate = function () { $http.get("/client/partner_info/"+partner.data.client_moniker+"/incremental_service/"+$stateParams.channel+"/info").then(function(res){ $scope.serviceInfo =res.data - $scope.serviceInfo.logo_url = '/static/images/'+$scope.serviceInfo.channel+'.jpg' - $scope.serviceInfo.logo_url = $scope.CheckImgExists($scope.serviceInfo.logo_url)?$scope.serviceInfo.logo_url:'/static/images/royalpay_sign.png' + if ($scope.serviceInfo == undefined || $scope.serviceInfo =='') { + $scope.serviceInfo = {}; + } + if ($scope.serviceInfo.logo_url) { + $scope.serviceInfo.logo_url = '/static/images/'+$scope.serviceInfo.channel+'.jpg'; + $scope.serviceInfo.logo_url = $scope.CheckImgExists($scope.serviceInfo.logo_url)?$scope.serviceInfo.logo_url:'/static/images/royalpay_sign.png'; + }else { + $scope.serviceInfo.logo_url = '/static/images/R跨境商城.jpg'; + } }) } diff --git a/src/main/ui/static/incrementalService/templates/partner_incremental_service.html b/src/main/ui/static/incrementalService/templates/partner_incremental_service.html index 5ba831e9a..bcc9316f0 100644 --- a/src/main/ui/static/incrementalService/templates/partner_incremental_service.html +++ b/src/main/ui/static/incrementalService/templates/partner_incremental_service.html @@ -134,10 +134,12 @@
- 未启用 + 未启用 + 已启用
+ -
+
@@ -145,7 +147,17 @@ 一站式跨境进口电商SaaS平台，帮您快速构建自己的品牌自营商城系统，直达10亿+中国消费者，快速实现获客和交易变现。
-
+
+ + 查看详情 + +
+
申请开通 diff --git a/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html b/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html index 5ee935b5f..b5e07baaf 100644 --- a/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html +++ b/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html @@ -84,7 +84,7 @@ {{serviceInfo.channel}} Service Info - 前去跨境商城
    @@ -103,22 +103,26 @@
    -
    +
    {{serviceInfo.incremental_mode==1?'固定手续费':'固定金额扣款' }}
    -
    - +
    + {{serviceInfo.incremental_mode==1?serviceInfo.incremental_rate_value+'%':serviceInfo.total_incremental_amount}}
    -
    +
    {{serviceInfo.create_time }}
    -
    +
    {{serviceInfo.is_valid?'已启用':'未启用' }}
    +
    + + 已启用 +
    @@ -134,19 +138,6 @@
    -