+
+
+ ![]()
+ {{customer.nickname}}
+ |
+
+
+ ![]()
+ {{customer.nickname}}
+ |
+
+
+ ![]()
+ {{customer.nickname}}
+ |
+
+
+ ![]()
+ {{customer.nickname}}
+ |
|
|
@@ -179,6 +201,8 @@
uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
+ 
{{order.order_id}}
{{order.short_name}}(JD Pay |
HF Pay
+ ng-click="params.channel='hf';doAnalysis(1)">HF Pay |
+ RPay +
diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html
index c1f522e0c..7f19fc00e 100644
--- a/src/main/ui/static/analysis/templates/settlement_transactions.html
+++ b/src/main/ui/static/analysis/templates/settlement_transactions.html
@@ -48,6 +48,11 @@
+
+
+ 
+
+
diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 17f6b602a..9fac48e1a 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -97,7 +97,9 @@
JD Pay |
HF Pay
+ ng-click="params.channel='hf';doAnalysis(1)">HF Pay |
+ RPay +
@@ -197,6 +199,17 @@
+
+
+
+
+
diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
index b23530dd5..5f4be2c4e 100644
--- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
+++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
@@ -32,6 +32,8 @@
ng-click="params.channel='jd';loadTradeLogs()">JD Pay |
HF Pay
+ RPay +
diff --git a/src/main/ui/static/cms/cms.js b/src/main/ui/static/cms/cms.js
index 3ab730034..156cda39b 100644
--- a/src/main/ui/static/cms/cms.js
+++ b/src/main/ui/static/cms/cms.js
@@ -4,6 +4,67 @@
define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angular) {
'use strict';
var app = angular.module('cms', ['ui.router','ng.uditor']);
+ var style = [
+ {
+ "style_key":"settlement",
+ "style_value":""
+ },
+ {
+ "style_key":"home_select",
+ "style_value":""
+ },
+ {
+ "style_key":"activity_gray",
+ "style_value":""
+ },
+ {
+ "style_key":"activity_select",
+ "style_value":""
+ },
+ {
+ "style_key":"mess_gray",
+ "style_value":""
+ },
+ {
+ "style_key":"mess_select",
+ "style_value":""
+ },
+ {
+ "style_key":"my_select",
+ "style_value":""
+ },
+ {
+ "style_key":"transaction",
+ "style_value":""
+ },
+ {
+ "style_key":"statistics",
+ "style_value":""
+ },
+ {
+ "style_key":"marketing_account",
+ "style_value":""
+ },
+ {
+ "style_key":"usergroup",
+ "style_value":""
+ },
+ {
+ "style_key":"coupon",
+ "style_value":""
+ },
+ {
+ "style_key":"rpbill",
+ "style_value":""
+ },
+ {
+ "style_key":"invoice_assistant",
+ "style_value":""
+ },
+ {
+ "style_key":"home_gray",
+ "style_value":""
+ }];
app.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('cms', {
url: '/cms',
@@ -38,7 +99,41 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu
}).state('cms.phone_top_up', {
url: '/phone_top_up',
controller: 'CmsPhonetopupCtrl',
- templateUrl: '/static/cms/templates/phone_top_up.html'
+ templateUrl: '/static/cms/templates/phone_top_up.html',
+ }).state('cms.app_style',{
+ url: '/app_style',
+ controller: 'cmsAppStyleListCtrl',
+ templateUrl: '/static/cms/templates/app_style.html',
+ }).state('cms.app_style.app_style_preview',{
+ url: '/{style_id}/preview',
+ controller: 'cmsAppStylePreviewCtrl',
+ templateUrl: '/static/cms/templates/app_style_preview.html',
+ resolve: {
+ appStyles: ['$http', '$stateParams', function ($http, $stateParams) {
+ return $http.get('/app/cms/app_style/style_group/' + $stateParams.style_id);
+ }]
+ }
+ }).state('cms.app_style.app_style_save',{
+ url: '/save',
+ controller: 'cmsAppStyleSaveCtrl',
+ templateUrl: '/static/cms/templates/app_style_config.html',
+ resolve: {
+ style: function () {
+ return angular.copy(style);
+ }
+ }
+ }).state('cms.app_style.app_style_edit',{
+ url: '/{style_id}/edit',
+ controller: 'cmsAppStyleEditCtrl',
+ templateUrl: '/static/cms/templates/app_style_config.html',
+ resolve: {
+ appStyles: ['$http', '$stateParams', function ($http, $stateParams) {
+ return $http.get('/app/cms/app_style/style_group/' + $stateParams.style_id);
+ }],
+ style: function () {
+ return angular.copy(style);
+ }
+ }
})
}]);
app.controller('cmsRootCtrl', ['$scope', function ($scope) {
@@ -140,6 +235,142 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu
$scope.article = article.data;
}]);
+ app.controller('cmsAppStyleListCtrl', ['$scope', '$http', '$uibModal', function ($scope, $http, $uibModal) {
+ $scope.pagination = {};
+ $scope.appStyleGroupList = function (page) {
+ var params = $scope.queryParams || {};
+ params.page = page || $scope.pagination.page || 1;
+ $http.get('/app/cms/app_style/style_group', {params: params}).then(function (resp) {
+ $scope.appStyleGroups = resp.data.data;
+ $scope.pagination = resp.data.pagination;
+ })
+ };
+ $scope.appStyleGroupList(1);
+ }]);
+
+ app.controller('cmsAppStylePreviewCtrl', ['$scope', '$http', 'appStyles', function ($scope, $http, appStyles) {
+ $scope.appStyles = appStyles.data.data;
+ }]);
+
+ app.controller('cmsAppStyleEditCtrl', ['$scope', '$http', '$state','commonDialog', 'appStyles', 'style', function ($scope, $http, $state, commonDialog, appStyles, style) {
+ $scope.ctrl = {sending: false, flag: false, originStyleId: angular.copy(appStyles.data.data[0].style_id)};
+ $scope.entity={};
+ $scope.style = angular.copy(style);
+ $scope.entity.appStyle = angular.copy(appStyles.data.data);
+ $scope.params = {style_id: angular.copy(appStyles.data.data[0].style_id)};
+ $scope.appStyleList = function() {
+ var styleKeyStr = "";
+ $scope.entity.appStyle.forEach(function(item){
+ styleKeyStr += item.style_key + ",";
+ });
+ $scope.style.forEach(function(item){
+ if (styleKeyStr.indexOf(item.style_key) < 0) {
+ $scope.entity.appStyle.push({"style_key": item.style_key,"style_value":""});
+ }
+ })
+ };
+ $scope.appStyleList();
+ $scope.addSpecOption = function() {
+ $scope.entity.appStyle.push({});
+
+ };
+
+ // 删除规格选项
+ $scope.delSpecOption = function(index) {
+ $scope.entity.appStyle.splice(index, 1);
+
+ };
+
+ $scope.saveOneGroupAppStyle = function() {
+ if ($scope.params.style_id == "" || $scope.params.style_id == null) {
+ $scope.errmsg = "title不能为空";
+ return;
+ }
+ var item = "";
+ for (var i=0;i<$scope.entity.appStyle.length;i++) {
+ item = $scope.entity.appStyle[i];
+ if (item.style_value == "" || item.style_value == null) {
+ $scope.errmsg = "value不能为空";
+ return;
+ }
+ if (item.style_value.substr(0,4).toLowerCase() != "http" &&
+ item.style_value.substr(0,5).toLowerCase() != "https") {
+ $scope.errmsg = "value必须以http或者https开头";
+ return;
+ }
+
+ }
+ $scope.ctrl.sending = true;
+ $http.put('/app/cms/app_style/style_group/' + $scope.params.style_id + '/style?originStyleId=' + $scope.ctrl.originStyleId, $scope.entity).then(function(){
+ $scope.ctrl.sending = false;
+ $state.go('cms.app_style.app_style_preview',{style_id: $scope.params.style_id});
+ }, function (resp) {
+ $scope.ctrl.sending = false;
+ $scope.errmsg = resp.data.message;
+ })
+ }
+ $scope.toggleAppStyleIsValid = function(styleId) {
+ if (styleId) {
+ commonDialog.confirm({
+ title: '确认操作',
+ content: '当前操作将发布title为：' +styleId +"的app图标，是否确认？"
+ }).then(function () {
+ $http.put('/app/cms/app_style/style_group/' + styleId).then(function () {
+ $state.reload();
+ })
+ })
+ }
+ }
+ }]);
+ app.controller('cmsAppStyleSaveCtrl', ['$scope', '$http', '$state', 'style', function ($scope, $http, $state, style) {
+ $scope.ctrl = {sending: false, flag: true};
+ $scope.entity={};
+ $scope.entity.appStyle = angular.copy(style);
+ $scope.params = {style_id: ""};
+ $scope.addSpecOption = function() {
+ $scope.entity.appStyle.push({});
+
+ };
+
+ // 删除规格选项
+ $scope.delSpecOption = function(index) {
+ console.log(index)
+ $scope.entity.appStyle.splice(index, 1);
+
+ };
+
+ $scope.saveOneGroupAppStyle = function() {
+ if ($scope.params.style_id == "" || $scope.params.style_id == null) {
+ $scope.errmsg = "title不能为空";
+ return;
+ }
+ var item = "";
+ for (var i=0;i<$scope.entity.appStyle.length;i++) {
+ item = $scope.entity.appStyle[i];
+ if (item.style_value == "" || item.style_value == null) {
+ $scope.errmsg = "value不能为空";
+ return;
+ }
+ if (item.style_value.substr(0,4).toLowerCase() != "http" &&
+ item.style_value.substr(0,5).toLowerCase() != "https") {
+ $scope.errmsg = "value必须以http或者https开头";
+ return;
+ }
+
+ }
+ $scope.ctrl.sending = true;
+ $http.post('/app/cms/app_style/style_group?style_id=' + $scope.params.style_id, $scope.entity).then(function(){
+ $scope.ctrl.sending = false;
+ $state.go('cms.app_style.app_style_preview', {style_id: $scope.params.style_id});
+ }, function (resp) {
+ $scope.ctrl.sending = false;
+ $scope.errmsg = resp.data.message;
+ })
+ };
+ $scope.checkStyleValue = function () {
+
+ }
+ }]);
app.filter('topUpType', function () {
return function (status) {
switch (status + '') {
diff --git a/src/main/ui/static/cms/templates/app_style.html b/src/main/ui/static/cms/templates/app_style.html
new file mode 100644
index 000000000..613b0f19d
--- /dev/null
+++ b/src/main/ui/static/cms/templates/app_style.html
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+ | Title |
+ Published |
+ Operation |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Title |
+ Style_Key |
+ Style_Value |
+
+
+
+
+ |
+ |
+ |
+
+
+
+
+
+ |
@@ -120,7 +122,7 @@
-
+
+
+
+
+
+
+
Transaction: ${{detail.RpayDetail.total_amount}}
+ Commission: ${{detail.RpayDetail.total_prize}}
+ Send: ${{detail.RpayDetail.send_prize}}
+ Fund: ${{detail.RpayDetail.total_donation}}
+
+
+
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
index 1ab3492ee..4d314367a 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
@@ -107,6 +107,18 @@
+
diff --git a/src/main/ui/static/config/devtools/devtools.js b/src/main/ui/static/config/devtools/devtools.js
index e5dd667ed..009e3dcc5 100644
--- a/src/main/ui/static/config/devtools/devtools.js
+++ b/src/main/ui/static/config/devtools/devtools.js
@@ -63,6 +63,10 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
url: '/hfupdate',
templateUrl: '/static/config/devtools/templates/hfupdate.html',
controller: 'hfupdateCtrl'
+ }).state('devtools.rpayupdate', {
+ url: '/rpayupdate',
+ templateUrl: '/static/config/devtools/templates/rpayupdate.html',
+ controller: 'rpayupdateCtrl'
})
}]);
app.controller('devManualRefundCtrl', ['$scope', '$http', 'commonDialog', function ($scope, $http, commonDialog) {
@@ -384,6 +388,22 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
}]);
+ app.controller('rpayupdateCtrl', ['$scope', '$http','$filter', function ($scope, $http,$filter) {
+ $scope.selecttotal = true;
+ $scope.update = function () {
+ $scope.totalhide = true;
+ $scope.selecttotal = false;
+
+ $http.put('/dev/rpayUpdate').then(function (resp) {
+ $scope.totalhide = false;
+ $scope.selecttotal = true;
+ }, function (resp) {
+ alert(resp.data.message);
+ })
+ }
+
+ }]);
+
return app;
});
\ No newline at end of file
diff --git a/src/main/ui/static/config/devtools/templates/hfupdate.html b/src/main/ui/static/config/devtools/templates/hfupdate.html
index aa428f774..aa834204e 100644
--- a/src/main/ui/static/config/devtools/templates/hfupdate.html
+++ b/src/main/ui/static/config/devtools/templates/hfupdate.html
@@ -1,5 +1,5 @@
diff --git a/src/main/ui/static/config/devtools/templates/rpayupdate.html b/src/main/ui/static/config/devtools/templates/rpayupdate.html
new file mode 100644
index 000000000..f91337e4f
--- /dev/null
+++ b/src/main/ui/static/config/devtools/templates/rpayupdate.html
@@ -0,0 +1,15 @@
+
+
- * @apiHeader Accept application/json
- * @apiHeader Content-Type application/json
- * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4位大写字母或数字构成
- * @apiParam (PathVariable) {String} order_id 必填，商户支付订单号，要求同一商户唯一
- * @apiUse Sign
- * @apiParam (JSON) {String} description 必填，订单标题（最大长度128字符，超出自动截取）
- * @apiParam (JSON) {int} price 必填，金额，单位为货币最小单位，例如使用100表示AUD1.00
- * @apiParam (JSON) {String=AUD,CNY} currency=AUD 币种代码
- * @apiParam (JSON) {String=Alipay,Wechat} channel 支付渠道，大小写敏感
- * @apiParam (JSON) {String} notify_url 支付通知url，详见支付通知api，不填则不会推送支付通知
- * @apiParam (JSON) {String} operator 操作人员标识
- *
- * @apiSuccess {String} return_code 执行结果
- * @apiSuccess {String} result_code SUCCESS表示创建订单成功，EXISTS表示订单已存在
- * @apiSuccess {String} partner_code 商户编码
- * @apiSuccess {String} channel 支付渠道
- * @apiSuccess {String} full_name 商户注册全名
- * @apiSuccess {String} partner_name 商户名称
- * @apiSuccess {String} order_id RoyalPay订单ID，同时也是微信订单ID，最终支付成功的订单ID可能不同
- * @apiSuccess {String} partner_order_id 商户订单ID
- * @apiSuccess {String} pay_url 跳转URL
- *
- * @apiUse GlobalError
- * @apiError (ERROR_CODE) ORDER_MISMATCH 订单号与商户不匹配
- * @apiError (ERROR_CODE) ORDER_PAID 订单已支付
- *
- */
-/**
- * @api {GET} /api/v1.0/h5_payment/partners/{partner_code}/orders/{order_id}/pay H5支付跳转页
- * @apiName MobileH5Pay
- * @apiDescription 必须先调用创建H5支付订单接口再进行跳转。
- * 建议在用户回调到对应页时通过后台查询订单状态接口确认订单的支付状态。
- * @apiVersion 1.0.0
- * @apiGroup MobileH5
- * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4位大写字母或数字构成
- * @apiParam (PathVariable) {String} order_id 必填，商户支付订单号，要求已预先创建
- * @apiUse Sign
- * @apiParam (QueryParam) {String} redirect 必填，支付成功后跳转页面，回调时会带上签名参数用于校验
- *
- * @apiUse GlobalError
- * @apiError (ERROR_CODE) ORDER_NOT_EXIST 订单不存在
- * @apiError (ERROR_CODE) ORDER_MISMATCH 订单号与商户不匹配
- */
+
/**
* @api {PUT} /api/v1.0/jsapi_gateway/partners/{partner_code}/orders/{order_id} 创建JSAPI订单
diff --git a/src/document/en/apis.js b/src/document/en/apis.js
index a09a8949e..7abb83c7d 100644
--- a/src/document/en/apis.js
+++ b/src/document/en/apis.js
@@ -109,62 +109,7 @@
* @apiError (ERROR_CODE) ORDER_NOT_EXIST Order does not exist
* @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner
*/
-/**
- * @api {PUT} /api/v1.0/h5_payment/partners/{partner_code}/orders/{order_id} Create H5 Payment
- * @apiName NewMobileH5Pay
- * @apiGroup MobileH5
- * @apiVersion 1.0.0
- * @apiDescription
- * Warning：H5 Payment socket requires application separately and requires agreement from Tencent. Merchants who needs this socket please contact RoyalPay first.
- * Alipay has no limit at the moment.
+