From 3fac4f2c5838d2cc265ca3e521049dc33e207add Mon Sep 17 00:00:00 2001 From: hellolujian <1370256381@qq.com> Date: Sun, 30 Sep 2018 01:14:30 +0800 Subject: [PATCH 1/8] =?UTF-8?q?[fix]=E4=BC=98=E5=8C=96SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/mappers/ClientAnalysisMapper.xml | 48 +++++++++++-------- 1 file changed, 28 insertions(+), 20 deletions(-) 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 1f14033e4..2373135bf 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 @@ -144,17 +144,23 @@ --> - + From 7401a9e41445d5a55291581b14a3df16e89cfd6d Mon Sep 17 00:00:00 2001 From: hellolujian <1370256381@qq.com> Date: Sun, 30 Sep 2018 01:23:13 +0800 Subject: [PATCH 2/8] [fix] --- .../payment/manage/analysis/web/DashboardController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java index a0000005a..87738f269 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java @@ -69,7 +69,8 @@ public class DashboardController { @RequestParam(defaultValue = "10") int limit) { JSONObject params = analysis.toParams(analysis.getTimezone()); orgManager.checkOrg(manager,params); - return dashboardService.getTopTradePartners(params, limit); + params.put("limit", limit); + return dashboardService.getTopTradePartners(params); } @ManagerMapping("/rank_trade_partners") From 447fea52e677628ad50cd134bc72001d78da0ed6 Mon Sep 17 00:00:00 2001 From: hellolujian <1370256381@qq.com> Date: Sun, 30 Sep 2018 01:30:46 +0800 Subject: [PATCH 3/8] [fix] --- .../manage/analysis/beans/AnalysisBean.java | 24 +++++++++---------- .../analysis/core/DashboardService.java | 2 +- .../core/impls/DashboardServiceImpl.java | 2 ++ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java index dc67aed73..65edd513b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java @@ -62,7 +62,7 @@ public class AnalysisBean { if (bd_id != null){ params.put("bd_id",bd_id); } - if (org_id !=null){ + if (org_id != null){ params.put("org_id",org_id); } if (begin_month != null){ @@ -71,25 +71,25 @@ public class AnalysisBean { if (end_month != null){ params.put("end_month",end_month); } - if (customer_id!=null && !customer_id.isEmpty()){ - params.put("customer_id",customer_id.trim()); + if (customer_id != null && !customer_id.isEmpty()){ + params.put("customer_id", customer_id.trim()); } - if (rankType!=null){ - params.put("rankType",rankType); + if (rankType != null){ + params.put("rankType", rankType); } - if(channel!=null){ - params.put("channel",channel); + if(channel != null){ + params.put("channel", channel); } - if(bd_name!=null){ - params.put("bd_name",bd_name); + if(bd_name != null){ + params.put("bd_name", bd_name); } - if (client_moniker!=null){ + if (client_moniker != null){ params.put("client_moniker", client_moniker); } - if (amount_from!=null && amount_from.length()>0){ + if (amount_from != null && amount_from.length() > 0){ params.put("amount_from", new BigDecimal(amount_from)); } - if (amount_to!=null && amount_to.length()>0){ + if (amount_to != null && amount_to.length() > 0){ params.put("amount_to", new BigDecimal(amount_to)); } return params; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java index eb071d334..53202d7a1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java @@ -22,7 +22,7 @@ public interface DashboardService { List getTradeInTypes(JSONObject params); - List getTopTradePartners(JSONObject params, int limit); + //List getTopTradePartners(JSONObject params, int limit); List getTopTradePartners(JSONObject params); diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java index 97ef7c216..5887c83ea 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java @@ -161,12 +161,14 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT return transactionAnalysisMapper.getTradeAmountInTypes(params); } + /* @Override public List getTopTradePartners(JSONObject params, int limit) { params.put("rankType", "aud_fee"); params.put("limit", limit); return clientAnalysisMapper.listPartnersTradeAmount(params); } + */ @Override public List getTopTradePartners(JSONObject params) { From f0b17d85046e078f65c15b2bf5ae97c624200b41 Mon Sep 17 00:00:00 2001 From: hellolujian <1370256381@qq.com> Date: Sun, 30 Sep 2018 11:28:02 +0800 Subject: [PATCH 4/8] =?UTF-8?q?[fix]=E6=96=B0=E5=A2=9Etransaction=5Ffee?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/partner_bankaccounts.html | 2 ++ .../partner/templates/partner_new_rate.html | 23 +++++++++++++++++ .../partner/templates/rate_config_dialog.html | 25 +++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html index f1e00b160..b67d76a26 100644 --- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html +++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html @@ -179,6 +179,7 @@ Rate Name Rate Value + Transaction Fee Active Time Expire Time Clean Days @@ -193,6 +194,7 @@ ng-class="{'text-bold':rate.current,'success':rate.active}"> + T+{{rate.clean_days}} diff --git a/src/main/ui/static/payment/partner/templates/partner_new_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_rate.html index fe0aa512f..98299cef6 100644 --- a/src/main/ui/static/payment/partner/templates/partner_new_rate.html +++ b/src/main/ui/static/payment/partner/templates/partner_new_rate.html @@ -160,6 +160,29 @@ + +
+ +
+
+ +
%
+
+
+
+ No less than 0 +
+
+ Required Field +
+
+ +
+
+ +
diff --git a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html index 421be18ab..d06a7eac6 100644 --- a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html +++ b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html @@ -35,6 +35,31 @@
+ +
+ +
+
+ +
%
+
+
+ + + +
+ No less than 0 +
+
+ Required Field +
+
+ +
+
+
From 4738df405090d4d6b6900d662b37a0837e7bd724 Mon Sep 17 00:00:00 2001 From: luoyang Date: Sun, 30 Sep 2018 11:32:22 +0800 Subject: [PATCH 5/8] fix rpay+ merchant --- .../manage/mappers/system/SysRpayMerchantApplyMapper.java | 2 +- .../manage/merchants/core/impls/ClientManagerImpl.java | 7 +++++-- .../payment/partner/templates/sub_merchant_id_apply.html | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java index 898ac3661..23620f712 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java @@ -21,6 +21,6 @@ public interface SysRpayMerchantApplyMapper { void insertRpayMerchantApply(JSONObject params); @AutoSql(type = SqlType.SELECT) - List listByShortName(@Param("client_id") int client_id,@Param("merchant_shortname") String shortName); + List listByShortName(@Param("merchant_shortname") String shortName); } 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 0bf26977a..e18ded9b0 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 @@ -3605,10 +3605,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } checkOrgPermission(manager, client); - List listByshortName = sysRpayMerchantApplyMapper.listByShortName(client.getIntValue("client_id"),merchantInfo.getString("company_shortname")); + List listByshortName = sysRpayMerchantApplyMapper.listByShortName(merchantInfo.getString("company_shortname")); if (listByshortName.size()>0) { - throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（请避免和Rpay+商务号列表内的Company Short Name重复）"); + throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（Short Name 已被使用）"); + } + if (client.getString("rpay_enterprise_id") != null) { + throw new BadRequestException("您已申请成功子商务号，请勿重复申请"); } SubRpayMerchantInfo subRpayMerchantInfo = JSONObject.toJavaObject(merchantInfo, SubRpayMerchantInfo.class); 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 66ebd8403..8deec83d1 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 @@ -99,7 +99,7 @@ Rpay+ Sub Merchant Id : {{partner.rpay_enterprise_id}} -
diff --git a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html index d06a7eac6..d92b9ecf6 100644 --- a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html +++ b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html @@ -43,7 +43,7 @@
-
%
+