From b76f33463792baf50a30e5a1925c44493e311c86 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 25 Mar 2020 14:26:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E6=9C=8D=E5=8A=A1=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4d4b10548..7a978e921 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,7 +4,7 @@ spring.profiles.active=dev,alipay,bestpay,jd,wechat,rpay,yeepay env.company=RoyalPay -multipart.max-file-size=10Mb +multipart.max-file-size=10MB spring.datasource.test-while-idle=true #连接池检测释放周期 @@ -155,4 +155,7 @@ qcloud.scf.region=ap-hongkong apple.message.apns.file= apple.message.apns.password= android.message.appkey= -android.message.secret= \ No newline at end of file +android.message.secret= + +spring.servlet.multipart.max-file-size=20MB +spring.servlet.multipart.max-request-size=20MB From a3b43675affe335a1634e8530c29c966abfe10a1 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 25 Mar 2020 15:33:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?add=20=E5=95=86=E6=88=B7=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=B6=8B=E5=8A=BF=E5=A2=9E=E5=8A=A0=E7=99=BE?= =?UTF-8?q?=E5=88=86=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../merchants/beans/ClientRegisterInfo.java | 47 +--- .../manager/ManagerUserInterceptor.java | 5 +- .../mappers/TransactionAnalysisMapper.xml | 26 +- .../ui/static/analysis/partners-analysis.js | 2 +- .../transaction/analysis-transaction.js | 251 ++++++++++++++++-- src/main/ui/static/commons/angular-echarts.js | 2 +- .../ui/static/commons/services/chartParser.js | 2 +- .../static/commons/services/wechatGoodMcc.js | 2 +- .../partner/templates/add_partner.html | 90 ------- .../templates/add_sub_partner_dialog.html | 90 ------- .../partner/templates/partner_detail.html | 49 ---- .../partner/templates/partner_edit.html | 90 ------- 13 files changed, 249 insertions(+), 409 deletions(-) diff --git a/pom.xml b/pom.xml index 6699cf29c..978a1b3df 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.4.12 + 1.4.13 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java index 237427b42..5a961a42b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java @@ -3,8 +3,8 @@ package au.com.royalpay.payment.manage.merchants.beans; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.annotation.JSONField; -import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Pattern; /** @@ -95,12 +95,7 @@ public class ClientRegisterInfo { private String country; @Pattern(regexp = "^((Australia/West)|(Australia/Eucla)|(Australia/North)|(Australia/South)|(Australia/Brisbane)|(Australia/Melbourne)|(Australia/LHI))$", message = "error.payment.valid.invalid_timezone") private String timezone; - private String jdindustry; private String royalpayindustry; - private String hfindustry; - private String lakalapayindustry; - private String lakalapaygoods; - private String lakalapaysettle; private String referrer_id; private String referrer_name; @@ -364,14 +359,6 @@ public class ClientRegisterInfo { this.alipayIndustry = alipayIndustry; } - public String getJdindustry() { - return jdindustry; - } - - public void setJdindustry(String jdindustry) { - this.jdindustry = jdindustry; - } - public String getRoyalpayindustry() { return royalpayindustry; } @@ -412,14 +399,6 @@ public class ClientRegisterInfo { this.merchant_video_url = merchant_video_url; } - public String getHfindustry() { - return hfindustry; - } - - public void setHfindustry(String hfindustry) { - this.hfindustry = hfindustry; - } - public void setStoreName(String storeName) { this.storeName = storeName; } @@ -444,30 +423,6 @@ public class ClientRegisterInfo { return client_pay_desc; } - public String getLakalapayindustry() { - return lakalapayindustry; - } - - public void setLakalapayindustry(String lakalapayindustry) { - this.lakalapayindustry = lakalapayindustry; - } - - public String getLakalapaygoods() { - return lakalapaygoods; - } - - public void setLakalapaygoods(String lakalapaygoods) { - this.lakalapaygoods = lakalapaygoods; - } - - public String getLakalapaysettle() { - return lakalapaysettle; - } - - public void setLakalapaysettle(String lakalapaysettle) { - this.lakalapaysettle = lakalapaysettle; - } - public String getRepresentativePerson() { return representativePerson; } diff --git a/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java b/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java index 99b31c31a..ffa3b33aa 100644 --- a/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java +++ b/src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java @@ -7,10 +7,8 @@ import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import au.com.royalpay.payment.tools.http.HttpUtils; import au.com.royalpay.payment.tools.permission.enums.PartnerRole; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; - import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -21,11 +19,10 @@ import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; -import java.lang.reflect.Method; - import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.lang.reflect.Method; /** * Created by yixian on 2016-06-25. diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml index 0485158ff..58d305856 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml @@ -1111,18 +1111,30 @@ SELECT sum(so.total) as total_amount, sum(so.orders) as orders, + + SUM(IF((c.royalpayindustry =1 or c.royalpayindustry like '100%'),so.total,0)) as industry_total_amount, + SUM(IF((c.royalpayindustry =1 or c.royalpayindustry like '100%'),so.orders,0)) as industry_orders, + convert(SUM(IF((c.royalpayindustry =1 or c.royalpayindustry like '100%'),so.total,0))/sum( so.total )*100,decimal(15,2)) as amount_pcent, + convert(SUM(IF((c.royalpayindustry =1 or c.royalpayindustry like '100%'),so.orders,0))/sum( so.orders )*100,decimal(15,2)) as order_pcent, + + + sum(so.total) as industry_total_amount, + sum(so.orders) as industry_orders, + 100 as amount_pcent, + 100 as order_pcent, + + + + SUM(IF(c.royalpayindustry like #{industry},so.total,0)) as industry_total_amount, + SUM(IF(c.royalpayindustry like #{industry},so.orders,0)) as industry_orders, + convert(SUM(IF(c.royalpayindustry like #{industry},so.total,0))/sum( so.total )*100,decimal(15,2)) as amount_pcent, + convert(SUM(IF(c.royalpayindustry like #{industry},so.orders,0))/sum( so.orders )*100,decimal(15,2)) as order_pcent, + DATE_FORMAT(so.date, '%Y-%m-%d' ) as trans_date FROM statistics_customer_order so inner JOIN sys_clients c ON so.client_id = c.client_id AND c.is_valid = 1 - - AND (c.royalpayindustry =1 or c.royalpayindustry like '100%') - - - - AND c.royalpayindustry like #{industry} - and so.date >= #{from} and so.date < #{to} and so.client_id!=0 diff --git a/src/main/ui/static/analysis/partners-analysis.js b/src/main/ui/static/analysis/partners-analysis.js index 80a96e797..32a1fdadd 100644 --- a/src/main/ui/static/analysis/partners-analysis.js +++ b/src/main/ui/static/analysis/partners-analysis.js @@ -425,4 +425,4 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an }]); return app; -}); \ No newline at end of file +}); diff --git a/src/main/ui/static/analysis/transaction/analysis-transaction.js b/src/main/ui/static/analysis/transaction/analysis-transaction.js index afee22de4..825ddfda5 100644 --- a/src/main/ui/static/analysis/transaction/analysis-transaction.js +++ b/src/main/ui/static/analysis/transaction/analysis-transaction.js @@ -1,7 +1,7 @@ /** * Created by yishuqian on 24/05/2017. */ -define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angular) { +define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','echarts'], function (angular,echarts) { 'use strict'; var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090']; var app = angular.module('analysisTransaction', ['ui.bootstrap', 'ui.router', 'ngEcharts']); @@ -445,12 +445,13 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul $scope.params = {industry: 0}; $scope.today = new Date(); $scope.pagination = {limit:20}; + $scope.royalpay_label = '全部'; $scope.loadRoyalpayindustry = function () { $http.get('/static/data/royalpayindustry.json').then(function (resp) { $scope.royalpayindustry = resp.data; var selectAll = { - "label": "All", + "label": "全部", "mccCode": "0", "children":{} }; @@ -462,6 +463,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul $scope.onRoyalPayIndustrySelect = function (selectedItem) { $scope.params.royalpay_label = selectedItem.label; + $scope.royalpay_label = selectedItem.label; $scope.params.industry = selectedItem.mccCode; $scope.doAnalysis(); }; @@ -500,55 +502,248 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul $scope.params.from = monthBegin; $scope.doAnalysis(); }; - var amountAnalysis = { + var orderOption = { chart: { + yAxis: { + splitLine: {show: true}, + axisLine: { + lineStyle: { + color: '#000' + } + } + }, + backgroundColor: '#fff', tooltip: { trigger: 'axis', - formatter: '{b}:AUD {c}' - }, - yAxis: { - type: 'value', - name: '交易金额(AUD)' + axisPointer: { + type: 'shadow' + }, + formatter: '总订单数 : {c0}
' + + '行业订单数 : {c1}
' + + '占比 : {c4}%' }, - color: colors + legend: { + data: ['当日总订单数', '行业订单数'], + textStyle: { + color: '#000' + } + } }, xAxis: { basic: { - type: 'category', - boundaryGap: false + axisLine: { + lineStyle: { + color: '#000' + } + } }, key: 'trans_date' }, - series: [ + series: [{ + basic: { + label:{ + normal: { + show: true, + position: 'outside', + offset: [0, 0], + textStyle: { + fontSize: 15, + fontFamily: 'Arial' + } + }}, + name: '当日总订单数', + type: 'line', + smooth: true, + showAllSymbol: true, + symbol: 'emptyCircle', + symbolSize: 5 + }, + column: {key: 'orders'} + }, { + basic: { + label:{ + normal: { + show: true, + position: 'right', + offset: [0, 0], + textStyle: { + fontSize: 15, + fontFamily: 'Arial' + } + }}, + name: '行业订单数', + type: 'bar', + barWidth: 10, + itemStyle: { + barBorderRadius: 5, + color: '#14c8d4' + } + }, + column: {key: 'industry_orders'} + }, { + basic: { + name: '当日总订单数', + type: 'bar', + barGap: '-100%', + barWidth: 10, + z: -12, + itemStyle: { + color: '#fff' + } + }, + column: {key: 'orders'} + }, { + basic: { + name: '当日总订单数', + type: 'pictorialBar', + symbol: 'rect', + itemStyle: { + color: '#0f375f' + }, + symbolRepeat: true, + symbolSize: [12, 4], + symbolMargin: 1, + z: -10 + }, + column: {key: 'orders'} + }, { - basic: {type: 'line', label: {normal: {show: true}}, showAllSymbols: true}, - column: {key: 'total_amount'} + basic: { + name: 'pcent', + type: 'pictorialBar', + symbol: 'rect', + itemStyle: { + color: '#fff' + }, + symbolRepeat: true, + symbolSize: [12, 4], + symbolMargin: 1, + z: -10 + }, + column: {key: 'order_pcent'} } ] }; - var ordersAnalysis = { + + var amountOption = { chart: { + yAxis: { + splitLine: {show: true}, + axisLine: { + lineStyle: { + color: '#000' + } + } + }, + backgroundColor: '#fff', tooltip: { trigger: 'axis', - formatter: '{b}:AUD {c}' - }, - yAxis: { - type: 'value', - name: '订单数' + axisPointer: { + type: 'shadow' + }, + formatter: '总交易额 : AUD {c0}
' + + '行业交易额 : AUD {c1}
' + + '占比 : {c4}%' }, - color: colors + legend: { + data: ['当日总交易额', '行业交易额'], + textStyle: { + color: '#000' + } + } }, xAxis: { basic: { - type: 'category', - boundaryGap: false + axisLine: { + lineStyle: { + color: '#000' + } + } }, key: 'trans_date' }, - series: [ + series: [{ + basic: { + label:{ + normal: { + show: true, + position: 'outside', + offset: [0, 0], + textStyle: { + fontSize: 15, + fontFamily: 'Arial' + } + }}, + name: '当日总交易额', + type: 'line', + smooth: true, + showAllSymbol: true, + symbol: 'emptyCircle', + symbolSize: 5 + }, + column: {key: 'total_amount'} + }, { + basic: { + label:{ + normal: { + show: true, + position: 'right', + offset: [0, 0], + textStyle: { + fontSize: 12, + fontFamily: 'Arial' + } + }}, + name: '行业交易额', + type: 'bar', + barWidth: 10, + itemStyle: { + barBorderRadius: 5, + color: '#14c8d4' + } + }, + column: {key: 'industry_total_amount'} + }, { + basic: { + name: '当日总交易额', + type: 'bar', + barGap: '-100%', + barWidth: 10, + z: -12, + itemStyle: { + color: '#fff' + } + }, + column: {key: 'total_amount'} + }, { + basic: { + name: '当日总交易额', + type: 'pictorialBar', + symbol: 'rect', + itemStyle: { + color: '#0f375f' + }, + symbolRepeat: true, + symbolSize: [12, 4], + symbolMargin: 1, + z: -10 + }, + column: {key: 'total_amount'} + }, { - basic: {type: 'line', label: {normal: {show: true}}, showAllSymbols: true}, - column: {key: 'orders'} + basic: { + name: 'pcent', + type: 'pictorialBar', + symbol: 'rect', + itemStyle: { + color: '#fff' + }, + symbolRepeat: true, + symbolSize: [12, 4], + symbolMargin: 1, + z: -10 + }, + column: {key: 'amount_pcent'} } ] }; @@ -565,8 +760,8 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul delete params.royalpay_label; $http.get('/analysis/rp_industry/echarts', {params: params}).then(function (resp) { $scope.analysisData = resp.data; - $scope.amountAnalysis = chartParser.parse(amountAnalysis, resp.data); - $scope.ordersAnalysis = chartParser.parse(ordersAnalysis, resp.data); + $scope.amountAnalysis = chartParser.parse(amountOption, resp.data); + $scope.ordersAnalysis = chartParser.parse(orderOption, resp.data); $scope.future_loading = false; $scope.chooseDay = $filter('date')($scope.params.from, 'yyyy-MM-dd'); $scope.loadTopTransPartners(1); diff --git a/src/main/ui/static/commons/angular-echarts.js b/src/main/ui/static/commons/angular-echarts.js index 0b9350984..d03468762 100644 --- a/src/main/ui/static/commons/angular-echarts.js +++ b/src/main/ui/static/commons/angular-echarts.js @@ -79,4 +79,4 @@ define(['angular', 'echarts'], function (angular, echarts) { } }]); return app; -}); \ No newline at end of file +}); diff --git a/src/main/ui/static/commons/services/chartParser.js b/src/main/ui/static/commons/services/chartParser.js index 725fb16c1..4a5f8793a 100644 --- a/src/main/ui/static/commons/services/chartParser.js +++ b/src/main/ui/static/commons/services/chartParser.js @@ -72,4 +72,4 @@ define(['../app', 'angular'], function (app, angular) { } }]); -}); \ No newline at end of file +}); diff --git a/src/main/ui/static/commons/services/wechatGoodMcc.js b/src/main/ui/static/commons/services/wechatGoodMcc.js index 51851f5a5..e44b0a479 100644 --- a/src/main/ui/static/commons/services/wechatGoodMcc.js +++ b/src/main/ui/static/commons/services/wechatGoodMcc.js @@ -579,4 +579,4 @@ define(["../app"], function (app) { } }); }) -; \ No newline at end of file +; diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html index 81a32685b..1bec9f8b7 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -1308,26 +1308,6 @@ -
- -
- -
-

Required - Field

-
-
-
- -
- -
- -
- -
-
- -
- -
- -
-

- Required Field

-
-
-
- -
- -
- -
-

- Required Field

-
-
-
- -
- -
- -
-

- Required Field

-
-
-
diff --git a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html index ea6876105..e9b65dc12 100644 --- a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html +++ b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html @@ -1172,27 +1172,6 @@ - -
- -
- -
-

Required - Field

-
-
-
- -
- -
- -
- -
-
-
- -
- -
-

- Required Field

-
-
-
- -
- -
- -
-

- Required Field

-
-
-
- -
- -
- -
-

- Required Field

-
-
-
diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html index e1258f32d..934bdd78c 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -1035,16 +1035,6 @@ -
- -
-

- -
-
-
@@ -1079,45 +1069,6 @@ ng-if="$root.complianceCheck.clientInfo">
- -
- -
-

- {{partner.hfindustry| partner_hf_industry}} -    ({{partner.hfindustry}}) -

- -
-
-
- -
-

- -
-
-
- -
-

- -
-
-
- -
-

- -
-
diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html index 67dc57d72..2c2a33896 100644 --- a/src/main/ui/static/payment/partner/templates/partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/partner_edit.html @@ -1168,26 +1168,6 @@ -
- -
- -
-

Required - Field

-
-
-
- -
- -
- -
- -
-
- -
- -
- -
-

- Required Field

-
-
-
- -
- -
- -
-

- Required Field

-
-
-
- -
- -
- -
-

- Required Field

-
-
-