From 86d07c5f69ffeca3b85210bbc171703cc073b810 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Tue, 30 Jan 2018 15:38:14 +0800 Subject: [PATCH] fix~ --- .../manage/merchants/core/ClientManager.java | 2 +- .../core/impls/ClientManagerImpl.java | 11 +- .../web/PartnerManageController.java | 4 +- .../static/payment/partner/partner-manage.js | 101 ++++++++++++++---- .../templates/apply_sub_merchant_id.html | 7 +- .../templates/sub_merchant_id_apply.html | 98 +++++++++++------ 6 files changed, 161 insertions(+), 62 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java index 291fa155b..c093b50cc 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java @@ -268,7 +268,7 @@ public interface ClientManager { List listSubMerchantIdApplys(JSONObject manager, String clientMoniker); - void subMerchantApplication(String clientMoniker, SubMerchantIdApply subMerchantApply,JSONObject manager); + String subMerchantApplication(String clientMoniker, SubMerchantIdApply subMerchantApply,JSONObject manager); List listMerchantIds(String clientMoniker,JSONObject manager); 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 941eda037..8751ce9e4 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 @@ -2962,8 +2962,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid object.put("merchant_id",client.getString("merchant_id")); object.put("create_time",new Date()); object.put("operator",manager.getString("display_name")); - sysWxMerchantApplyMapper.insertWxMerchantApply(object); - List applyQuery = sysWxMerchantApplyMapper.listWxMerchantApplices(client.getInteger("client_id"),new PageBounds(Order.formString("create_time.desc"))); + List applyQuery = new ArrayList<>(); + applyQuery.add(object); return applyQuery; } } @@ -2971,7 +2971,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } @Override @CacheEvict(value = ":all_sub_merchant_id_applices:", key = "#clientMoniker") - public void subMerchantApplication(String clientMoniker, SubMerchantIdApply subMerchantApply,JSONObject manager) { + public String subMerchantApplication(String clientMoniker, SubMerchantIdApply subMerchantApply,JSONObject manager) { JSONObject client = getClientInfoByMoniker(clientMoniker); if (client == null) { throw new InvalidShortIdException(); @@ -2979,7 +2979,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid checkOrgPermission(manager, client); JSONObject params = subMerchantApply.insertObject(); SubMerchantInfo subMerchantInfo = JSONObject.toJavaObject(params,SubMerchantInfo.class); - params.put("merchant_id",client.getString("merchant_id")); + params.put("merchant_id",subMerchantApply.getMerchant_id()); params.put("client_id",client.getString("client_id")); params.put("create_time",new Date()); params.put("operator",manager.getString("display_name")); @@ -2990,8 +2990,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid sysWxMerchantApplyMapper.insertWxMerchantApply(params); clearCacheSubMerchantIdApplices(clientMoniker); }else { - throw new BadRequestException(); + throw new BadRequestException(elem.elementText("return_msg")); } + return sub_merchant_id; } @Override diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java index 8928e732f..2c15a63f2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java @@ -489,8 +489,8 @@ public class PartnerManageController { } @ManagerMapping(value = "/{clientMoniker}/sub_apply",method = RequestMethod.POST,role = {ManagerRole.OPERATOR,ManagerRole.ADMIN}) - public void subMerchantApplication(@PathVariable String clientMoniker, @RequestBody SubMerchantIdApply subMerchantIdApply, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { - clientManager.subMerchantApplication(clientMoniker,subMerchantIdApply,manager); + public String subMerchantApplication(@PathVariable String clientMoniker, @RequestBody SubMerchantIdApply subMerchantIdApply, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { + return clientManager.subMerchantApplication(clientMoniker,subMerchantIdApply,manager); } @ManagerMapping(value = "/{clientMoniker}/get_merchant_ids",method = RequestMethod.GET,role = {ManagerRole.OPERATOR,ManagerRole.ADMIN}) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index f019de6eb..619fee907 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -32,51 +32,51 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter ]; var wxMerchantIndustries = [ { - "label": "鞋包服饰", + "label": "鞋包服饰|Shoes&Garments", "value": "343" }, { - "label": "机票行业", + "label": "机票行业|Air Ticket", "value": "493" }, { - "label": "文具/办公用品", + "label": "文具/办公用品|Stationery/office supplies", "value": "492" }, { - "label": "酒店行业", + "label": "酒店行业|Hotel Industry", "value": "491" }, { - "label": "教育行业", + "label": "教育行业|Education Industry", "value": "490" }, { - "label": "国际物流", + "label": "国际物流|Logistics", "value": "489" }, { - "label": "数码电器", + "label": "数码电器|Digital appliance", "value": "488" }, { - "label": "母婴", + "label": "母婴|Maternal and infant", "value": "487" }, { - "label": "化妆品", + "label": "化妆品|Cosmetics", "value": "486" }, { - "label": "食品", + "label": "食品|Food", "value": "485" }, { - "label": "综合商城", + "label": "综合商城|Comprehensive mall", "value": "484" }, { - "label": "其它货物贸易行业", + "label": "其它货物贸易行业|Other trade industry", "value": "494" } ]; @@ -2576,12 +2576,24 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } } }]); - app.controller('subMerchantIdApplicaitonsCtrl', ['$scope', '$http', '$uibModal','$state', function ($scope, $http, $uibModal, $state) { + app.controller('subMerchantIdApplicaitonsCtrl', ['$scope', '$http', '$uibModal','$state','commonDialog', function ($scope, $http, $uibModal, $state,commonDialog) { $scope.loadSubMerchantInfos = function () { $http.get('/sys/partners/' + $scope.partner.client_moniker + '/list_sub_applices', {params: {}}).then(function (resp) { $scope.subMerchantInfos = resp.data; }); }; + $scope.useSubMerchantId = function (sub_merchant_id) { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/payment_config', {sub_merchant_id: sub_merchant_id}).then(function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Modify Wechat Sub Merchant ID successfully', + type: 'success' + }); + $state.reload(); + }, function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + }); + } $scope.applySubMerchantId = function () { $uibModal.open({ templateUrl: '/static/payment/partner/templates/apply_sub_merchant_id.html', @@ -2600,7 +2612,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }; $scope.loadSubMerchantInfos(); }]); - app.controller('applySubMerchantIdCtrl', ['$scope', '$http', '$uibModal','$state','subMerchantInfo', '$filter','merchantIds', function ($scope, $http, $uibModal, $state, subMerchantInfo,$filter,merchantIds) { + app.controller('applySubMerchantIdCtrl', ['$scope', '$http', '$uibModal','$state','subMerchantInfo', '$filter','merchantIds','commonDialog', function ($scope, $http, $uibModal, $state, subMerchantInfo,$filter,merchantIds,commonDialog) { $scope.wxIndustries = angular.copy(wxMerchantIndustries); $scope.subMerchantInfo = angular.copy(subMerchantInfo); $scope.merchantIds = merchantIds.data; @@ -2615,10 +2627,34 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }); return; } - $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker+ '/sub_apply', $scope.subMerchantInfo).then(function () { - alert("Success"); + $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker+ '/sub_apply', $scope.subMerchantInfo).then(function (resp) { + $scope.apply_sub_merchant_id = resp.data; $scope.$close(); - $state.reload(); + if(subMerchantInfo.sub_merchant_id != null){ + commonDialog.confirm({title:'Confirm',content:'已申请成功，是否确认使用'}).then(function () { + $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', {sub_merchant_id: $scope.apply_sub_merchant_id}).then(function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Modify Wechat Sub Merchant ID successfully', + type: 'success' + }); + $state.reload(); + }, function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + }); + }) + }else { + $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', {sub_merchant_id: $scope.apply_sub_merchant_id}).then(function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Apply Success And Modify Wechat Sub Merchant ID successfully', + type: 'success' + }); + $state.reload(); + }, function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) + }); + } }, function (resp) { $scope.errmsg = resp.data.message; }) @@ -2640,7 +2676,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter return bdUsers; } }); - + app.filter('wxMerchants', function () { + return function (values) { + var industry = ''; + angular.forEach(wxMerchantIndustries, function (wxMerchant) { + if (wxMerchant.value == values) { + industry = wxMerchant.label; + } + }); + return industry; + } + }); app.filter('bdOrgSelect', function () { return function (bdUsers, params) { var org_id; @@ -2700,5 +2746,24 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } } }); + + app.filter('cut', function () { + return function (value, wordwise, max, tail) { + if (!value) return ''; + + max = parseInt(max, 10); + if (!max) return value; + if (value.length <= max) return value; + + value = value.substr(0, max); + if (wordwise) { + var lastspace = value.lastIndexOf(' '); + if (lastspace != -1) { + value = value.substr(0, lastspace); + } + } + return value + (tail || ' …'); + }; + }); return app; }); \ No newline at end of file diff --git a/src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html index 66183d6cc..4db9ba2a4 100644 --- a/src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html +++ b/src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html @@ -5,7 +5,6 @@
Apply Sub Merchant Id
-
@@ -76,13 +75,13 @@
+ type="url" name="website" id="website_input" required>

Required Field

- +
@@ -155,7 +154,7 @@
diff --git a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html index 22b23a645..4c02dd91b 100644 --- a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html +++ b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html @@ -1,9 +1,39 @@ +
+

+ Sub Merchant Id : {{partner.sub_merchant_id}} + +

+
+