From 9e9f472f3dd653c0e531d973d7af282c5e7c6f91 Mon Sep 17 00:00:00 2001 From: luoyang14z7 <704328506@qq.com> Date: Tue, 3 Jul 2018 17:51:01 +0800 Subject: [PATCH 1/2] devtools : add --- .../ui/static/config/devtools/devtools.js | 39 +++++++++++++++++++ .../devtools/templates/orgusertest.html | 2 +- .../config/devtools/templates/root.html | 8 ++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/src/main/ui/static/config/devtools/devtools.js b/src/main/ui/static/config/devtools/devtools.js index c410bba37..79a863c89 100644 --- a/src/main/ui/static/config/devtools/devtools.js +++ b/src/main/ui/static/config/devtools/devtools.js @@ -51,6 +51,14 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { url: '/phone_top_up', templateUrl: '/static/config/devtools/templates/phone_top_up.html', controller: 'phonetopupCtrl' + }).state('devtools.orgusertest', { + url: '/orgusertest', + templateUrl: '/static/config/devtools/templates/orgusertest.html', + controller: 'orgusertestCtrl' + }).state('devtools.aliforexcel', { + url: '/aliforexcel', + templateUrl: '/static/config/devtools/templates/aliforexcel.html', + controller: 'aliforexcelCtrl' }) }]); app.controller('devManualRefundCtrl', ['$scope', '$http', 'commonDialog', function ($scope, $http, commonDialog) { @@ -302,6 +310,37 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { }) } }]); + app.controller('orgusertestCtrl', ['$scope', '$http', '$filter','commonDialog', function ($scope, $http, $filter,commonDialog) { + $scope.regist = function () { + + $http.post('/dev/orgusertest',{client_moniker: $scope.company}).then(function (resp) { + commonDialog.alert({title: 'SUCCESS', content:"注册成功", type: 'success'}) + }, function (resp) { + commonDialog.alert({title: 'Error', content: "商品编号已存在", type: 'Error'}) + }) + } +}]); + app.controller('aliforexcelCtrl', ['$scope', '$filter', function ($scope, $filter) { + $scope.params = {}; + var str = $filter('date')(new Date(), 'yyyyMMdd'); + var oDate = new Date(str.slice(0, 4), str.slice(4, 6) - 1, str.slice(-2)); + var oDay = oDate.getDay(); + var oNum = oDate.getDate(); + var bWeek1 =new Date(str.slice(0, 4), str.slice(4, 6) - 1, oNum-oDay-6); + var bWeek2 =new Date(str.slice(0, 4), str.slice(4, 6) - 1, oNum-oDay); + $scope.params.datefrom = bWeek1; + $scope.params.dateto = bWeek2; + $scope.Export = function () { + var params = angular.copy($scope.params); + params.datefrom = $filter('date')(params.datefrom, 'yyyy-MM-dd'); + params.dateto = $filter('date')(params.dateto, 'yyyy-MM-dd'); + var url = '/dev/aliforexcel'; + var connectSymbol = '?'; + url += connectSymbol + 'datefrom=' + params.datefrom + '&' + 'dateto=' + params.dateto; + return url; + } + + }]); return app; }); \ No newline at end of file diff --git a/src/main/ui/static/config/devtools/templates/orgusertest.html b/src/main/ui/static/config/devtools/templates/orgusertest.html index 002f27f98..909a0a792 100644 --- a/src/main/ui/static/config/devtools/templates/orgusertest.html +++ b/src/main/ui/static/config/devtools/templates/orgusertest.html @@ -21,7 +21,7 @@
- +
diff --git a/src/main/ui/static/config/devtools/templates/root.html b/src/main/ui/static/config/devtools/templates/root.html index 6e18a1a0d..9acbec3d7 100644 --- a/src/main/ui/static/config/devtools/templates/root.html +++ b/src/main/ui/static/config/devtools/templates/root.html @@ -67,6 +67,14 @@ Phone Top Up + + + Partner test + + + + 支付宝进件导出 + From ec3139d99cc6c95d37a2722dc60ef3d31855fc79 Mon Sep 17 00:00:00 2001 From: luoyang14z7 <704328506@qq.com> Date: Tue, 3 Jul 2018 18:50:15 +0800 Subject: [PATCH 2/2] devtools:addaliexport --- .../manage/dev/web/TestController.java | 37 ++++++++++++------- .../manage/mappers/system/ClientMapper.java | 2 + .../manage/mappers/system/ClientMapper.xml | 14 +++++++ 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java index 26b0aa88c..b47bdbfa4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java @@ -10,8 +10,11 @@ import au.com.royalpay.payment.core.exceptions.InvalidShortIdException; import au.com.royalpay.payment.core.exceptions.OrderNotExistsException; import au.com.royalpay.payment.manage.analysis.core.PlatformClearService; import au.com.royalpay.payment.manage.appclient.core.RetailAppService; +import au.com.royalpay.payment.manage.dev.bean.AliExcel; import au.com.royalpay.payment.manage.dev.bean.Message; import au.com.royalpay.payment.manage.dev.bean.SendWechatMessage; +import au.com.royalpay.payment.manage.dev.core.AliforexcelService; +import au.com.royalpay.payment.manage.dev.core.NewpartnerService; import au.com.royalpay.payment.manage.dev.core.WechatMessageService; import au.com.royalpay.payment.manage.mappers.customers.CustomerEncourageMoneyUseLogMapper; import au.com.royalpay.payment.manage.mappers.log.NotifyErrorLogMapper; @@ -30,11 +33,9 @@ import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.tools.utils.PdfUtils; import au.com.royalpay.payment.tools.utils.TimeZoneUtils; import au.com.royalpay.payment.tools.utils.XmlFormatUtils; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; - import org.apache.commons.lang3.time.DateFormatUtils; import org.dom4j.Element; import org.slf4j.Logger; @@ -44,14 +45,12 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.util.Assert; import org.springframework.validation.Errors; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -60,11 +59,6 @@ import java.net.URISyntaxException; import java.util.Date; import java.util.List; -import javax.annotation.Resource; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; - /** * Created by yixian on 2016-07-06. */ @@ -109,6 +103,10 @@ public class TestController implements ApplicationEventPublisherAware { private ApplicationEventPublisher publisher; @Resource private WechatMessageService wechatMessageService; + @Resource + private NewpartnerService newpartnerService; + @Resource + private AliforexcelService aliforexcelService; @ManagerMapping(value = "/{clientMoniker}/export/agreepdf", method = RequestMethod.GET, role = {ManagerRole.ADMIN, ManagerRole.DIRECTOR, ManagerRole.OPERATOR}) public void exportAgreeFile(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, HttpServletResponse httpResponse) throws Exception { @@ -380,4 +378,15 @@ public class TestController implements ApplicationEventPublisherAware { wechatMessageService.sendMessageByOpenId(sendWechatMessage); } +/* @ManagerMapping(value = "/orgusertest", method = RequestMethod.POST, role = {ManagerRole.ADMIN,ManagerRole.DEVELOPER}) + public JSONObject orgusertest(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @RequestBody @Valid ClientTestRegisterInfo registery, + Errors errors) { + HttpUtils.handleValidErrors(errors); + return newpartnerService.registerClient(null, registery, manager); + }*/ + + @ManagerMapping(value = "/aliforexcel", method = RequestMethod.GET, role = ManagerRole.DEVELOPER) + public void aliforexcel(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, HttpServletResponse httpResponse, AliExcel query) throws Exception { + aliforexcelService.listClients(httpResponse,manager,query); + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java index 3e7772d95..830ef61bc 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java @@ -34,6 +34,8 @@ public interface ClientMapper { PageList listPartners(JSONObject params, PageBounds pagination); + List passPartners(JSONObject params); + List listClients(); List listPartnerSelection(JSONObject params, PageBounds pagination); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml index 3a39d95b2..048944469 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml @@ -166,6 +166,20 @@ and c.is_valid=1 +