From fc65cfea0ee0ddcfca18385489d2917e02b5fd65 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Thu, 26 Apr 2018 19:50:57 +0800 Subject: [PATCH] fix~ --- .../mappers/ClientAnalysisMapper.java | 2 -- .../core/MerchantIdManageService.java | 2 -- .../impl/MerchantIdManageServiceImpl.java | 5 --- .../web/MerchantIdManageController.java | 5 --- .../analysis/mappers/ClientAnalysisMapper.xml | 17 +--------- .../payment/merchantid/merchant_id_manager.js | 15 --------- .../templates/merchant_id_manage.html | 31 +++++++++++++++++-- 7 files changed, 29 insertions(+), 48 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java index b95c323d8..a84810107 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java @@ -35,6 +35,4 @@ public interface ClientAnalysisMapper { List countClientsTypes(JSONObject params); List notTradeSubMerchantId(); - - List listNotTradeClients(@Param("sub_merchant_id") String sub_merchant_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchantid/core/MerchantIdManageService.java b/src/main/java/au/com/royalpay/payment/manage/merchantid/core/MerchantIdManageService.java index 81a3b6bf9..ec5912ba7 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchantid/core/MerchantIdManageService.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchantid/core/MerchantIdManageService.java @@ -17,8 +17,6 @@ public interface MerchantIdManageService { List showClientMoniker(JSONObject manager,String sub_merchant_id); - List showNotTradeClientMoniker(JSONObject manager,String sub_merchant_id); - void save(JSONObject record); void disable(String sub_merchant_id); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchantid/core/impl/MerchantIdManageServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchantid/core/impl/MerchantIdManageServiceImpl.java index e8c4d2c9b..c1fe7f0f1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchantid/core/impl/MerchantIdManageServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchantid/core/impl/MerchantIdManageServiceImpl.java @@ -95,11 +95,6 @@ public class MerchantIdManageServiceImpl implements MerchantIdManageService { return clientMapper.listBySubMerchantId(sub_merchant_id); } - @Override - public List showNotTradeClientMoniker(JSONObject manager, String sub_merchant_id) { - return clientAnalysisMapper.listNotTradeClients(sub_merchant_id); - } - @Override public void save(JSONObject record) { JSONObject sub_merchant_id = commonSubMerchantIdMapper.find(record.getString("sub_merchant_id")); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchantid/web/MerchantIdManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchantid/web/MerchantIdManageController.java index c09090f21..ea706e83b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchantid/web/MerchantIdManageController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchantid/web/MerchantIdManageController.java @@ -50,11 +50,6 @@ public class MerchantIdManageController { return merchantIdManageService.showClientMoniker(manager,sub_merchant_id); } - @RequestMapping(method = RequestMethod.GET,value = "/not_trade/{sub_merchant_id}") - @RequireManager(role = {ManagerRole.OPERATOR}) - public List showNotTradeClientMoniker(@PathVariable() String sub_merchant_id,@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { - return merchantIdManageService.showNotTradeClientMoniker(manager,sub_merchant_id); - } @RequestMapping(value = "/common_sub_merchant_id", method = RequestMethod.GET) @RequireManager(role = {ManagerRole.OPERATOR}) diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml index 966c238fb..007950b60 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml @@ -142,25 +142,10 @@ FROM sys_clients c WHERE c.sub_merchant_id not in (SELECT p.sub_merchant_id FROM sys_clients p INNER JOIN pmt_orders o ON o.client_id = p.client_id AND o.status >4 AND o.confirm_time IS NOT NULL - WHERE datediff(now(), o.create_time) <= 30 AND p.sub_merchant_id is not null GROUP BY p.sub_merchant_id) AND c.sub_merchant_id IS not null AND c.merchant_id IS NOT NULL + WHERE datediff(now(), o.create_time) <= 25 AND p.sub_merchant_id is not null GROUP BY p.sub_merchant_id) AND c.sub_merchant_id IS not null AND c.merchant_id IS NOT NULL AND (c.approve_result = 1 OR c.approve_result= 2) AND c.is_valid = 1 ]]> GROUP by c.sub_merchant_id - - \ No newline at end of file diff --git a/src/main/ui/static/payment/merchantid/merchant_id_manager.js b/src/main/ui/static/payment/merchantid/merchant_id_manager.js index af5d7935f..87dbcbe51 100644 --- a/src/main/ui/static/payment/merchantid/merchant_id_manager.js +++ b/src/main/ui/static/payment/merchantid/merchant_id_manager.js @@ -54,18 +54,6 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS }) }; - $scope.showNotTradeClient = function (sub_merchant_id) { - $uibModal.open({ - templateUrl: '/static/payment/merchantid/templates/client_sub_merchant_id.html', - controller: 'showNotTradeClientsCtrl', - resolve: { - clients: ['$http', function ($http) { - return $http.get('/sys/merchant_id/not_trade/'+sub_merchant_id); - }] - }, - size: 'sm' - }) - }; $scope.refresh = function () { $scope.disable_button = true; $http.post('/sys/merchant_id/refresh').then(function (resp) { @@ -96,9 +84,6 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS app.controller('showClientsCtrl', ['$scope', '$http','clients', function ($scope, $http,clients) { $scope.clients = clients.data; }]); - app.controller('showNotTradeClientsCtrl', ['$scope', '$http','clients', function ($scope, $http,clients) { - $scope.clients = clients.data; - }]); app.controller('newCommonSubMerchantIdCtrl', ['$scope', '$http','commonDialog','$state', function ($scope, $http,commonDialog,$state) { $scope.params = {}; $scope.saveSubMerchantId = function () { diff --git a/src/main/ui/static/payment/merchantid/templates/merchant_id_manage.html b/src/main/ui/static/payment/merchantid/templates/merchant_id_manage.html index fe2c3c998..6863a3ff5 100644 --- a/src/main/ui/static/payment/merchantid/templates/merchant_id_manage.html +++ b/src/main/ui/static/payment/merchantid/templates/merchant_id_manage.html @@ -6,6 +6,22 @@ display: none; } + .i-rotate_90{ + animation:rotate_90 1s forwards; + -webkit-animation:rotate_90 1s forwards; /* Safari and Chrome */ + } + + @keyframes rotate_90 + { + from {transform:rotate(0deg);} + to {transform:rotate(90deg);} + } + + @-webkit-keyframes rotate_90 /* Safari and Chrome */ + { + from {-webkit-transform:rotate(0deg);} + to {-webkit-transform:rotate(90deg);} + }