msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source 
# Conflicts:
#	pom.xml
master
luoyang 5 years ago
parent 8885a01cd4 c735bc500f
commit e1c5c005c5
6 changed files with 56 additions and 33 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId>
<version>1.3.52</version>
<version>1.3.53</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

4
src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
Unescape View File

@ -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 {

11
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -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

25
src/main/ui/static/incrementalService/partner-incremental-service.js
Unescape View File

@ -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';
}
})
}

18
src/main/ui/static/incrementalService/templates/partner_incremental_service.html
Unescape View File

@ -134,10 +134,12 @@
<label class="label-left ">Status</label>
</div>
<div class="col-md-8 col-sm-8 col-xs-6 label-left">
<span style="color:#DD4B39">未启用</span>
<span ng-if="!currentUser.geek_shop_status" style="color:#DD4B39">未启用</span>
<span ng-if="currentUser.geek_shop_status" style="color:#00A65A">已启用</span>
</div>
</div>
<div class="row border-show" style="height: 68px;margin: -10px 0px 20px 5%;padding-top: -10px" >
<div class="row border-show" style="height: auto;margin: -10px 0px 20px 5%;padding-top: -10px" >
<div class="col-md-4 col-sm-4 col-xs-6 label-left">
<label class="label-left">Description</label>
</div>
@ -145,7 +147,17 @@
<span >一站式跨境进口电商SaaS平台，帮您快速构建自己的品牌自营商城系统，直达10亿+中国消费者，快速实现获客和交易变现。</span>
</div>
</div>
<div class="row border-show" style="background-color: #F06101;margin: -5px 0px -1px 0px; border-radius: 2px 1px 8px 8px; width: 100%;margin-left: 0px" >
<div class="row border-show"
ng-if="currentUser.geek_shop_status"
style="background-color: #F06101;margin: -5px 0px -1px 0px; border-radius: 2px 1px 8px 8px; width: 100%;margin-left: 0px" >
<a class="col-md-12 col-sm-12 col-xs-12 service-info-button"
title="查看详情" ui-sref="partnerIncrementalServiceInfo({channel:'RP跨境商城'})">
查看详情
</a>
</div>
<div class="row border-show"
ng-if="!currentUser.geek_shop_status"
style="background-color: #F06101;margin: -5px 0px -1px 0px; border-radius: 2px 1px 8px 8px; width: 100%;margin-left: 0px" >
<a target="_blank" class="col-md-12 col-sm-12 col-xs-12 service-info-button"
title="申请开通" ng-href="https://mch.royalpay.com.au/">
申请开通

29
src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html
Unescape View File

@ -84,7 +84,7 @@
<img height="40px" ng-src="{{serviceInfo.logo_url}}">
<span style="color:#F06101">{{serviceInfo.channel}}</span>
Service Info
<a ng-if="serviceInfo.channel=='RP跨境商城'" type="button" ng-click="getGeekSsoLoginUrl()"
<a ng-if="serviceInfo.channel=='RP跨境商城' || !serviceInfo.is_valid" type="button" ng-click="getGeekSsoLoginUrl()"
style="cursor: pointer;text-decoration: underline;padding-left: 20px"> 前去跨境商城</a>
</h1>
<ol class="breadcrumb">
@ -103,22 +103,26 @@
<div class="row">
<div class="col-sm-12">
<div class="row">
<div class="col-sm-3">
<div class="col-sm-3" ng-if="serviceInfo.is_valid">
<label>Mode:</label>
<span>{{serviceInfo.incremental_mode==1?'固定手续费':'固定金额扣款' }}</span>
</div>
<div class="col-sm-3">
<label>{{serviceInfo.incremental_mode==1?'Rate':'Amount'}}:</label>
<div class="col-sm-3" ng-if="serviceInfo.is_valid">
<label>{{serviceInfo.incremental_mode==1?'附加手续费':'Amount'}}:</label>
<span>{{serviceInfo.incremental_mode==1?serviceInfo.incremental_rate_value+'%':serviceInfo.total_incremental_amount}}</span>
</div>
<div class="col-sm-3">
<div class="col-sm-3" ng-if="serviceInfo.is_valid">
<label>Create Time:</label>
<span>{{serviceInfo.create_time }}</span>
</div>
<div class="col-sm-3">
<div class="col-sm-3" ng-if="serviceInfo.is_valid">
<label>Status:</label>
<span ng-style="{'color':serviceInfo.is_valid?'#00A65A':'#DD4B39'}">{{serviceInfo.is_valid?'已启用':'未启用' }}</span>
</div>
<div class="col-sm-3" ng-if="!serviceInfo.is_valid">
<label>Status:</label>
<span style="color:#00A65A">已启用</span>
</div>
</div>
</div>
</div>
@ -134,19 +138,6 @@
<div class="row">
<div class="col-sm-12">
<div class="form-horizontal">
<!--<div class="form-group col-xs-12">
<label class="control-label col-xs-4 col-sm-2">Source</label>
<div class="col-sm-10 col-xs-8">
<p class="form-control-static">
<a role="button" ng-class="{'bg-primary':params.source=='ALL'}"
ng-click="params.source='ALL';loadTradeLogs(1)">All</a> |
<a role="button" ng-class="{'bg-primary':params.source=='system'}"
ng-click="params.source='system';loadTradeLogs(1)">System</a> |
<a role="button" ng-class="{'bg-primary':params.source=='RP跨境商城'}"
ng-click="params.source='RP跨境商城';loadTradeLogs(1)">RP跨境商城</a>
</p>
</div>
</div>-->
<div class="form-group col-xs-12">
<label class="control-label col-xs-4 col-sm-2">Status</label>
<div class="col-sm-10 col-xs-8">

Write Preview
Loading…
Cancel
Save