diff --git a/src/db/modify.sql b/src/db/modify.sql index 177c8ce98..b106938b6 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -574,6 +574,11 @@ CREATE TABLE `sys_mail_unsub` ( alter table sys_clients add column ali_sub_merchant_id varchar(20) DEFAULT NULL; update sys_clients set ali_sub_merchant_id = client_moniker; +alter table sys_clients add column enable_hf tinyint(0) NOT NULL; +ALTER TABLE sys_org ADD COLUMN min_hf_rate DECIMAL(3,2) DEFAULT NULL COMMENT '旗下商户最低hf费率'; +ALTER TABLE sys_org ADD COLUMN hf_rate_value DECIMAL(3,2) DEFAULT NULL COMMENT '旗下商户hf费率'; + + ALTER TABLE `log_clearing_detail` ADD COLUMN `settle_bank` varchar(10) NULL DEFAULT NULL COMMENT '清算来源银行(RoyalPay)' AFTER `account_name`; update log_clearing_detail set settle_bank='CBA'; diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java index 8323c687e..1b3f2b439 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java @@ -29,6 +29,7 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService { listChannel.add(putParam(params,"Alipay")); listChannel.add(putParam(params,"AlipayOnline")); listChannel.add(putParam(params,"jd")); + listChannel.add(putParam(params,"hf")); return listChannel; } @@ -39,7 +40,7 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService { } List list = new ArrayList<>(); Map analysisMap = new TreeMap<>(); - String[] channels = {"Wechat","Bestpay","Alipay","jd","AlipayOnline"}; + String[] channels = {"Wechat","Bestpay","Alipay","jd","AlipayOnline","hf"}; for (String channel:channels){ analysisChannelCustomers(params, analysisMap, channel); } diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java index 1f208d280..8d05ba78b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java @@ -109,6 +109,13 @@ public class CustomersAnalysisServiceImp implements CustomersAnalysisService { } else { result.put("aliOnlineAmount", 0.00); } + params.put("channel", "hf"); + JSONObject hfPayAmount = customerAndOrdersStatisticsMapper.getSumCustomersChannelAnalysis(params); + if (hfPayAmount != null) { + result.put("hfPayAmount", hfPayAmount.getBigDecimal("total_amount")); + } else { + result.put("hfPayAmount", 0.00); + } return result; } 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 c9937503d..a1591b5dd 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 @@ -553,7 +553,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT } } private JSONObject getTodayChannelCount(JSONObject params){ - String[] channels = new String[]{"Bestpay","Wechat","Alipay","jd","AlipayOnline"}; + String[] channels = new String[]{"Bestpay","Wechat","Alipay","jd","AlipayOnline","hf"}; JSONObject resp = new JSONObject(); for(String channel:channels) { params.put("channel", channel); 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 efbba73e0..207d21377 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 @@ -320,4 +320,7 @@ public interface ClientManager { void removeSub(String client_moniker, JSONObject manager); String getShortLink(String client_moniker); + + @Transactional + void switchHfLink(JSONObject manager, String clientMoniker,boolean allow); } 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 ef0f05125..9a812f118 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 @@ -262,6 +262,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid private ClearingDetailMapper clearingDetailMapper; @Resource private ClearingLogMapper clearingLogMapper; + @Resource + private ClientConfigMapper clientConfigMapper; + private static final String SOURCE_AGREE_FILE = "source_agree_file"; @@ -1480,12 +1483,14 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid checkAddRate(config, "AlipayOnline", "alipayonline_rate_value", org, "min_alipayonline_rate"); checkAddRate(config, "Bestpay", "bestpay_rate_value", org, "min_bestpay_rate"); checkAddRate(config, "jd", "jd_rate_value", org, "min_jd_rate"); + checkAddRate(config, "hf", "hf_rate_value", org, "min_hf_rate"); configNewClientRate(config, clientId, "Wechat", "wechat_rate_value", org, "min_wechat_rate"); configNewClientRate(config, clientId, "Alipay", "alipay_rate_value", org, "min_alipay_rate"); configNewClientRate(config, clientId, "AlipayOnline", "alipayonline_rate_value", org, "min_alipayonline_rate"); configNewClientRate(config, clientId, "Bestpay", "bestpay_rate_value", org, "min_bestpay_rate"); configNewClientRate(config, clientId, "jd", "jd_rate_value", org, "min_jd_rate"); + configNewClientRate(config, clientId, "hf", "hf_rate_value", org, "min_hf_rate"); } @@ -3666,6 +3671,30 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid mailService.removeUnsub(sub.getLong("id")); } + @Override + public void switchHfLink(JSONObject manager, String clientMoniker, boolean allow) { + JSONObject client = getClientInfoByMoniker(clientMoniker); + if (client == null) { + throw new InvalidShortIdException(); + } + checkOrgPermission(manager, client); + + if(allow){ + if(StringUtils.isEmpty(client.getString("hf_pay_url"))){ + String hf_pay_url = getShortLink(clientMoniker); + client.put("hf_pay_url",hf_pay_url); + JSONObject clientConfig = new JSONObject(); + clientConfig.put("hf_pay_url",hf_pay_url); + clientConfig.put("client_id",client.getIntValue("client_id")); + clientConfigMapper.update(clientConfig); + clientMapper.update(client); + } + } + clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager, clientMoniker, "enable_link", allow)); + + + } + @Override public String getShortLink(String client_moniker){ String longUrl = PlatformEnvironment.getEnv().concatUrl("/api/v1.0/hf_gateway/partners/"+client_moniker+"/jump"); 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 57c66375d..2697b2c4c 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 @@ -536,4 +536,9 @@ public class PartnerManageController { clientManager.removeSub(clientMoniker,manager); } + @ManagerMapping(value = "/{clientMoniker}/hf", method = RequestMethod.PUT, role = {ManagerRole.SERVANT, ManagerRole.DEVELOPER}) + public void switchHfPermission(@PathVariable String clientMoniker, @RequestBody JSONObject pass, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { + clientManager.switchHfLink(manager, clientMoniker, pass.getBooleanValue("allow")); + } + } diff --git a/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java b/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java index 04b119196..baa3e543e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java @@ -28,6 +28,7 @@ public class OrgInfo { private Double bestpay_rate_value; private Double alipayonline_rate_value; private Double jd_rate_value; + private Double hf_rate_value; private int is_valid; private String search_text; private int page = 1; @@ -40,6 +41,7 @@ public class OrgInfo { private Double min_bestpay_rate; private Double min_jd_rate; private Double min_alipayonline_rate; + private Double min_hf_rate; public JSONObject toJsonParam() { JSONObject param = new JSONObject(); @@ -283,4 +285,20 @@ public class OrgInfo { public void setMin_alipayonline_rate(Double min_alipayonline_rate) { this.min_alipayonline_rate = min_alipayonline_rate; } + + public Double getHf_rate_value() { + return hf_rate_value; + } + + public void setHf_rate_value(Double hf_rate_value) { + this.hf_rate_value = hf_rate_value; + } + + public Double getMin_hf_rate() { + return min_hf_rate; + } + + public void setMin_hf_rate(Double min_hf_rate) { + this.min_hf_rate = min_hf_rate; + } } diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml index 8364cc935..326629b4b 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml @@ -314,7 +314,9 @@ ifnull(sum(CASE WHEN s.channel = 'jd' THEN s.total ELSE 0 END),0) jdamount, ifnull(sum(CASE WHEN s.channel = 'jd' THEN s.orders ELSE 0 END),0) jd_order_count, ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.total ELSE 0 END),0) alipayonlineamount, - ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.orders ELSE 0 END),0) alipayonline_order_count + ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.orders ELSE 0 END),0) alipayonline_order_count, + ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.total ELSE 0 END),0) hfamount, + ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.orders ELSE 0 END),0) hf_order_count, FROM statistics_customer_order s LEFT JOIN sys_clients c ON c.client_id = s.client_id and c.is_valid=1 ]]> 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 fe68f3396..6809568a6 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 @@ -200,6 +200,8 @@ THEN 'MICROAPP' WHEN 13 THEN 'Native QR Code' + WHEN 14 + THEN 'Share Link' END AS gateway_label, ifnull(sum(if(l.transaction_type='Credit',l.clearing_amount,0)), 0) aud_fee FROM pmt_transactions l @@ -463,6 +465,8 @@ THEN 'MICROAPP' WHEN 13 THEN 'Native QR Code' + WHEN 14 + THEN 'Share Link' END AS gateway_label, ifnull(COUNT(DISTINCT l.client_id), 0) partner_count FROM pmt_transactions l @@ -526,6 +530,9 @@ and o.gateway=13 + + and o.gateway=14 + and l.org_id=#{org_id} and l.org_id in #{org_id} @@ -615,6 +622,9 @@ and o.gateway=13 + + and o.gateway=14 + and ptran.org_id=#{org_id} and ptran.org_id in #{org_id} diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml index d4d2c9011..d88d057c9 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml @@ -89,6 +89,8 @@ THEN 'MICROAPP' WHEN 13 THEN 'Native QR Code' + WHEN 14 + THEN 'Share Link' END AS gateway, p.client_moniker partner_code, p.short_name partner_name, diff --git a/src/main/ui/static/analysis/channels_analysis.js b/src/main/ui/static/analysis/channels_analysis.js index cc599d9b8..7cf052150 100644 --- a/src/main/ui/static/analysis/channels_analysis.js +++ b/src/main/ui/static/analysis/channels_analysis.js @@ -119,7 +119,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' trigger: 'item', formatter :"{a} {b} : {c} ({d}%)" }, - color: ['#09bb07','#FF2D96','#00a0e9','00a0e9','#DC0808'], + color: ['#09bb07','#FF2D96','#00a0e9','00a0e9','#DC0808',"#FFFF33"], legend: { orient: 'vertical', y: '450px', @@ -158,7 +158,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' trigger: 'axis' }, legend: { - data: ['Alipay交易金额','AlipayOnline交易金额', 'Bestpay交易金额','Wechat交易金额',"JD Pay交易金额"], + data: ['Alipay交易金额','AlipayOnline交易金额', 'Bestpay交易金额','Wechat交易金额',"JD Pay交易金额","HF Pay交易金额"], bottom: 0, height: '15%', width: '80%', @@ -170,7 +170,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' type: 'value' } ], - color: ['#00a0e9','#00a0e9','#FF2D96','#09bb07','#DC0808'], + color: ['#00a0e9','#00a0e9','#FF2D96','#09bb07','#DC0808',"#FFFF33"] }, xAxis: { basic: {type: 'category', boundaryGap: false}, @@ -231,6 +231,17 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' yAxisIndex: 0 }, column: {key: 'jd.total'} + }, + { + basic: { + name: 'HF Pay交易金额', + type: 'line', + label: {normal: {show: true}}, + showAllSymbols: true, + showSymbol: true, + yAxisIndex: 0 + }, + column: {key: 'hf.total'} } ] }; @@ -241,7 +252,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' trigger: 'axis' }, legend: { - data: ['Alipay交易订单','AlipayOnline交易订单', 'Bestpay交易订单','Wechat交易订单',"JD Pay交易订单"], + data: ['Alipay交易订单','AlipayOnline交易订单', 'Bestpay交易订单','Wechat交易订单',"JD Pay交易订单","HF Pay交易订单"], bottom: 0, height: '15%', width: '80%', @@ -253,7 +264,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' type: 'value' } ], - color: ['#00a0e9','00a0e9','#FF2D96','#09bb07','#DC0808'], + color: ['#00a0e9','00a0e9','#FF2D96','#09bb07','#DC0808',"#FFFF33"] }, xAxis: { basic: {type: 'category', boundaryGap: false}, @@ -314,6 +325,17 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' yAxisIndex: 0 }, column: {key: 'jd.orders'} + }, + { + basic: { + name: 'HF Pay交易订单', + type: 'line', + label: {normal: {show: true}}, + showAllSymbols: true, + showSymbol: true, + yAxisIndex: 0 + }, + column: {key: 'hf.orders'} } ] }; @@ -323,7 +345,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' trigger: 'axis' }, legend: { - data: ['Alipay交易客单价','AlipayOnline交易客单价', 'Bestpay交易客单价','Wechat交易客单价',"JD Pay交易客单价"], + data: ['Alipay交易客单价','AlipayOnline交易客单价', 'Bestpay交易客单价','Wechat交易客单价',"JD Pay交易客单价","HF Pay交易客单价"], bottom: 0, }, yAxis: [ @@ -332,7 +354,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' type: 'value' } ], - color: ['#00a0e9','#00a0e9','#FF2D96','#09bb07','#DC0808'], + color: ['#00a0e9','#00a0e9','#FF2D96','#09bb07','#DC0808',"#FFFF33"] }, xAxis: { basic: {type: 'category', boundaryGap: false}, @@ -393,6 +415,17 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' yAxisIndex: 0 }, column: {key: 'jd.single_amount'} + }, + { + basic: { + name: 'HF Pay交易客单价', + type: 'line', + label: {normal: {show: true}}, + showAllSymbols: true, + showSymbol: true, + yAxisIndex: 0 + }, + column: {key: 'hf.single_amount'} } ] }; diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js index 944faa786..41e4ec3d8 100644 --- a/src/main/ui/static/analysis/clearing-log.js +++ b/src/main/ui/static/analysis/clearing-log.js @@ -502,6 +502,8 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func return '/static/images/wechatpay_sign_lg.png'; case 'jd': return '/static/images/jd_sign_lg.png'; + case 'hf': + return '/static/images/hf_sign_lg.png'; } } }); diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html index 0c6387fa1..d155affb3 100644 --- a/src/main/ui/static/analysis/templates/customer_analysis.html +++ b/src/main/ui/static/analysis/templates/customer_analysis.html @@ -177,6 +177,8 @@ uib-tooltip="AlipayOnline" ng-if="order.channel=='AlipayOnline'"/> + {{order.order_id}} {{order.short_name}}(BestPay | JD Pay + ng-click="params.channel='jd';doAnalysis(1)">JD Pay | + HF Pay

diff --git a/src/main/ui/static/analysis/templates/partner_customers_orders.html b/src/main/ui/static/analysis/templates/partner_customers_orders.html index 860df9b86..25b7e3865 100644 --- a/src/main/ui/static/analysis/templates/partner_customers_orders.html +++ b/src/main/ui/static/analysis/templates/partner_customers_orders.html @@ -98,7 +98,9 @@ BestPay | JD Pay + ng-click="params.channel='jd';doAnalysis(1)">JD Pay | + HF Pay

diff --git a/src/main/ui/static/analysis/templates/partner_trans_analysis.html b/src/main/ui/static/analysis/templates/partner_trans_analysis.html index ea67b4bea..b282d5943 100644 --- a/src/main/ui/static/analysis/templates/partner_trans_analysis.html +++ b/src/main/ui/static/analysis/templates/partner_trans_analysis.html @@ -98,7 +98,9 @@ BestPay | JD Pay + ng-click="params.channel='jd';doAnalysis(1)">JD Pay | + HF Pay

diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html index 1cd046fa2..c1f522e0c 100644 --- a/src/main/ui/static/analysis/templates/settlement_transactions.html +++ b/src/main/ui/static/analysis/templates/settlement_transactions.html @@ -43,6 +43,11 @@ +
  • + + + +
    • diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html index 2130ec5d1..89732d77f 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis.html +++ b/src/main/ui/static/analysis/templates/trans_analysis.html @@ -95,7 +95,9 @@ BestPay | JD Pay + ng-click="params.channel='jd';doAnalysis(1)">JD Pay | + HF Pay

    @@ -135,11 +137,73 @@
    各平台交易总额
    - +
    +
    +
    +
    Wechat
    +
    + +
    + +
    +
    +
    +
    +
    +
    Bestpay
    + +
    + +
    +
    +
    +
    +
    Alipay
    +
    + +
    + +
    +
    +
    +
    +
    AlipayOnline
    +
    + +
    + +
    +
    +
    +
    +
    JD Pay
    +
    + +
    + +
    +
    +
    +
    +
    HF Pay
    +
    + +
    +
    +
    +
    + - - + + <!––> -
    + + JD Pay:{{totalChannelAmount.hfPayAmount|currency: ' $ '}}–> + <!––> + <!–Znyoo:{{totalChannelAmount.znyooAmount|currency: ' $ '}}
    + -->
    diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html index f7844aafc..a9f28f395 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html +++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html @@ -65,7 +65,9 @@ BestPay | JD Pay + ng-click="params.channel='jd';doAnalysis(1)">JD Pay | + HF Pay

    @@ -95,7 +97,68 @@
    各平台交易总额
    - +
    +
    +
    +
    Wechat
    +
    + +
    + +
    +
    +
    +
    +
    +
    Bestpay
    + +
    + +
    +
    +
    +
    +
    Alipay
    +
    + +
    + +
    +
    +
    +
    +
    AlipayOnline
    +
    + +
    + +
    +
    +
    +
    +
    JD Pay
    +
    + +
    + +
    +
    +
    +
    +
    HF Pay
    +
    + +
    +
    +
    +
    +
    diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html index e9cd3c46c..b23530dd5 100644 --- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html +++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html @@ -29,7 +29,9 @@ BestPay | JD Pay + ng-click="params.channel='jd';loadTradeLogs()">JD Pay | + HF Pay

    diff --git a/src/main/ui/static/boot/indexMainApp.js b/src/main/ui/static/boot/indexMainApp.js index 7f6454032..d0a55cd3d 100644 --- a/src/main/ui/static/boot/indexMainApp.js +++ b/src/main/ui/static/boot/indexMainApp.js @@ -544,7 +544,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo case '12': return 'MICROAPP'; case '13': - return 'Native QR Code' + return 'Native QR Code'; + case '14': + return 'Share Link' } } }); diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js index b7cf22c8a..a0d12ce53 100644 --- a/src/main/ui/static/boot/managerMainApp.js +++ b/src/main/ui/static/boot/managerMainApp.js @@ -329,7 +329,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo case '12': return '小程序'; case '13': - return '原生二维码' + return '原生二维码'; + case '14': + return '账单链接' } } }); diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js index da8d7555b..bc2d39f35 100644 --- a/src/main/ui/static/commons/services/clearingDetailService.js +++ b/src/main/ui/static/commons/services/clearingDetailService.js @@ -58,6 +58,8 @@ define(['../app','decimal'], function (app,Decimal) { return '/static/images/wechatpay_sign_lg.png'; case 'jd': return '/static/images/jd_sign_lg.png'; + case 'hf': + return '/static/images/hf_sign_lg.png'; } } }); diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html index 9d5f9e874..e51a8e8d2 100644 --- a/src/main/ui/static/commons/templates/order_detail.html +++ b/src/main/ui/static/commons/templates/order_detail.html @@ -43,6 +43,8 @@ uib-tooltip=AlipayOnline" ng-if="order.channel=='AlipayOnline'"/> + {{order.order_id}}

    diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js index 409ef3a27..1d61028af 100644 --- a/src/main/ui/static/config/bdprize/bdprize.js +++ b/src/main/ui/static/config/bdprize/bdprize.js @@ -328,6 +328,8 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) { return '/static/images/wechatpay_sign_lg.png'; case 'jd': return '/static/images/jd_sign_lg.png'; + case 'hf': + return '/static/images/hf_sign_lg.png'; } } }); diff --git a/src/main/ui/static/config/organizations/templates/new_org.html b/src/main/ui/static/config/organizations/templates/new_org.html index 85d6bfad2..e42e41e9d 100644 --- a/src/main/ui/static/config/organizations/templates/new_org.html +++ b/src/main/ui/static/config/organizations/templates/new_org.html @@ -155,6 +155,18 @@ +
    + +
    +
    + + % +
    +
    +
    @@ -219,6 +231,18 @@
    +
    + +
    +
    + + % +
    +
    +
    %
    +
    + +
    + + % +
    +
    @@ -186,6 +193,15 @@ % +
    + +
    + + % +
    +
    diff --git a/src/main/ui/static/config/organizations/templates/org_detail_parent.html b/src/main/ui/static/config/organizations/templates/org_detail_parent.html index d979c6b2c..f77d47cb7 100644 --- a/src/main/ui/static/config/organizations/templates/org_detail_parent.html +++ b/src/main/ui/static/config/organizations/templates/org_detail_parent.html @@ -271,6 +271,13 @@ % +
    + +
    + + % +
    +
    @@ -322,6 +329,16 @@ %
    + +
    + +
    + + % +
    +
    diff --git a/src/main/ui/static/dashboard/templates/dashboard.html b/src/main/ui/static/dashboard/templates/dashboard.html index 157e72dd2..73b1c3d38 100644 --- a/src/main/ui/static/dashboard/templates/dashboard.html +++ b/src/main/ui/static/dashboard/templates/dashboard.html @@ -146,6 +146,19 @@
    JD Pay
    +
    +
    +
    交易额: + +
    +
    订单数: + +
    +
    HF
    +
    +
    diff --git a/src/main/ui/static/images/hf_sign.png b/src/main/ui/static/images/hf_sign.png new file mode 100644 index 000000000..b0bb91a19 Binary files /dev/null and b/src/main/ui/static/images/hf_sign.png differ diff --git a/src/main/ui/static/images/hf_sign_lg.png b/src/main/ui/static/images/hf_sign_lg.png new file mode 100644 index 000000000..2f9a4cedd Binary files /dev/null and b/src/main/ui/static/images/hf_sign_lg.png differ diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html index 5689f895c..43420b87c 100644 --- a/src/main/ui/static/invoice/templates/invoice_assistant.html +++ b/src/main/ui/static/invoice/templates/invoice_assistant.html @@ -204,6 +204,8 @@ uib-tooltip=Alipay" ng-if="trade.channel=='Alipay'"/> + {{trade.order_id2}} diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html index 81a760973..113dd5bc0 100644 --- a/src/main/ui/static/payment/invoice/templates/invoice.html +++ b/src/main/ui/static/payment/invoice/templates/invoice.html @@ -198,6 +198,8 @@ uib-tooltip=Alipay" ng-if="trade.channel=='Alipay'"/> + {{trade.order_id2}} diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index e786332b4..e0b90af65 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -1234,7 +1234,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }) }) }; - $scope.init = {jsapi: false, gateway: false, offline: false, refund: false,common_sub_merchant_id:false, channel: {},gateway_alipay_online:false}; + $scope.init = {jsapi: false, gateway: false, offline: false, refund: false,common_sub_merchant_id:false, channel: {},gateway_alipay_online:false,hf_Link:false}; $scope.switchCommonSubMerchantId = function () { if (!$scope.paymentInfo) { return; @@ -1274,6 +1274,28 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }) }) }; + $scope.toggleHfLink = function (channel) { + if (!channel) { + return; + } + if (!$scope.paymentInfo) { + return; + } + if (!$scope.init.hf_Link) { + $scope.init.hf_Link = true; + return; + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/hf', {allow: $scope.paymentInfo.enable_link}).then(function () { + $scope.loadPartnerPaymentInfo(); + }, function (resp) { + commonDialog.alert({ + title: 'Failed to change enable_link permission status', + content: resp.data.message, + type: 'error' + }); + }) + }; + $scope.toggleJsApi = function () { if (!$scope.paymentInfo) { return; @@ -1654,6 +1676,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.rate.alipayonline_rate_value = parseFloat($scope.sysRateConfig.t1.AlipayOnline); $scope.rate.bestpay_rate_value = parseFloat($scope.sysRateConfig.t1.Bestpay); $scope.rate.jd_rate_value = parseFloat($scope.sysRateConfig.t1.JDpay); + $scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t1.HFpay); break; } case '2': { @@ -1662,6 +1685,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.rate.bestpay_rate_value = parseFloat($scope.sysRateConfig.t2.Bestpay); $scope.rate.alipayonline_rate_value = parseFloat($scope.sysRateConfig.t2.AlipayOnline); $scope.rate.jd_rate_value = parseFloat($scope.sysRateConfig.t2.JDpay); + $scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t2.HFpay); break; } case '3': { @@ -1670,6 +1694,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.rate.bestpay_rate_value = parseFloat($scope.sysRateConfig.t3.Bestpay); $scope.rate.alipayonline_rate_value = parseFloat($scope.sysRateConfig.t3.AlipayOnline); $scope.rate.jd_rate_value = parseFloat($scope.sysRateConfig.t3.JDpay); + $scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t3.HFpay); break; } } diff --git a/src/main/ui/static/payment/partner/templates/client_bankaccounts.html b/src/main/ui/static/payment/partner/templates/client_bankaccounts.html index 516953a6d..acdb8b3e3 100644 --- a/src/main/ui/static/payment/partner/templates/client_bankaccounts.html +++ b/src/main/ui/static/payment/partner/templates/client_bankaccounts.html @@ -99,6 +99,9 @@
  • Bestpay
    • +
  • + HF +
    • 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 f9b2b4ca0..667e26b13 100644 --- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html +++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html @@ -170,6 +170,7 @@
  • Alipay(Online)
  • Bestpay
  • JDpay
    • +
  • HFpay
    • 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 1692b6e20..02f7c1875 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 @@ -136,6 +136,30 @@ +
    + +
    +
    + +
    %
    +
    +
    +
    + No more than 2.2% +
    +
    + No less than 0.6% +
    +
    + Required Field +
    +
    + +
    +
    +
    diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html index 9f8c729f7..9823002ac 100644 --- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html +++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html @@ -62,7 +62,9 @@ MiniProgram | Native QR Code + ng-click="params.gateway=[13];loadTradeLogs(1)">Native QR Code | + Share Link

    @@ -81,7 +83,9 @@ BestPay | JDpay + ng-click="params.channel='JD';loadTradeLogs(1)">JDpay | + HF

    @@ -180,6 +184,7 @@ + {{trade.order_id}} diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html index aae9797c6..8671dcfa1 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html @@ -35,6 +35,11 @@ +
  • + + + +
    • diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html index 7bd8e5ea3..50b3dc590 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html @@ -93,7 +93,9 @@ BestPay | JD Pay + ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay | + HF Pay

    @@ -124,7 +126,9 @@ MiniProgram | Native QR Code + ng-click="params.gateway=[13];loadTradeLogs(1)">Native QR Code | + Share Link

    @@ -317,6 +321,7 @@ AlipayAlipayOnline + {{trade.order_id}}
    diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html index 2fdc8b945..b68472e36 100644 --- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html @@ -161,30 +161,36 @@
    Channels
    -
    +
    -
    +
    -
    +
    -
    +
    +
    + +
    + +
    +
    @@ -307,6 +313,14 @@

    +
    +
    + +
    + +   {{paymentInfo.hf_pay_url}} +
    +
    diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html index 087583ce7..ff69b0c9d 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -93,7 +93,9 @@ BestPay | JD Pay

    @@ -292,6 +294,8 @@ uib-tooltip="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/> + {{trade.order_id2}}     		diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html index 28bee0ccd..f04435a1e 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -131,7 +131,9 @@ BestPay | JD Pay + ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay | + HF Pay

    @@ -162,7 +164,9 @@ MiniProgram | Native QR Code + ng-click="params.gateway=[13];loadTradeLogs(1)">Native QR Code | + Share Link

    @@ -345,6 +349,8 @@ uib-tooltip="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/> + {{trade.order_id}}