From 29500e60a7b7778305fc9a184ed2ce05e0f0d362 Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Thu, 23 Aug 2018 16:46:10 +0800 Subject: [PATCH 01/37] Settle Hour Config --- src/main/ui/static/payment/partner/partner-manage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 9571def61..3cdaf3946 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -1700,7 +1700,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.getBankAccount(); }) }; - $scope.settleHours = [{value: undefined, label: 'Default(24:00, GMT+10)'}]; + $scope.settleHours = [{value: 24, label: 'Default(24:00, GMT+10)'}]; for (var h = 24; h > 0; h--) { $scope.settleHours.push({value: h, label: ('00' + h).substr(-2) + ':00, ' + $scope.partner.timezone}); } From 7af0564814b229548557d81cb0d5ed513edf0635 Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Fri, 24 Aug 2018 16:00:51 +0800 Subject: [PATCH 02/37] =?UTF-8?q?[Y]=20=E4=BC=98=E5=8C=96=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E5=95=86=E6=88=B7=E5=8F=B7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MerchantIdManageServiceImpl.java | 9 ++- .../payment/merchantid/merchant_id_manager.js | 59 ++++++++++++-- .../templates/merchant_id_manage.html | 76 ++++++++++++------- 3 files changed, 107 insertions(+), 37 deletions(-) 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 6a77ac270..0af53f8db 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 @@ -62,8 +62,8 @@ public class MerchantIdManageServiceImpl implements MerchantIdManageService { @Override public Map> listSubMerchantId(JSONObject manager) { - List clients = clientMapper.listSubMerchantId(); - return getClientMap(clients); + List clients = clientMapper.listSubMerchantId(); + return getClientMap(clients); } @Override public JSONObject listNotTradeSubMerchantId(JSONObject manager) { @@ -139,7 +139,10 @@ public class MerchantIdManageServiceImpl implements MerchantIdManageService { client.put("temp_sub_merchant", true); } } - Map> clientsMap = clients.stream().filter(t->t.containsKey("merchant_id")).filter(t->t.containsKey("sub_merchant_id")).collect(Collectors.groupingBy(t->t.getString("merchant_id"))); + Map> clientsMap = clients.stream() + .filter(t->t.containsKey("merchant_id")) + .filter(t->t.containsKey("sub_merchant_id")) + .collect(Collectors.groupingBy(t->t.getString("merchant_id"))); return clientsMap; } 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 b184544da..fea7a0443 100644 --- a/src/main/ui/static/payment/merchantid/merchant_id_manager.js +++ b/src/main/ui/static/payment/merchantid/merchant_id_manager.js @@ -17,19 +17,61 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS }) }]); app.controller('merchantIdManageCtrl', ['$scope', '$state', '$http', function ($scope, $state, $http) { - $scope.isCollapsed = true; - $scope.toShow = false; - $scope.client_loading = true; + $scope.isCollapsed = true; + $scope.toShow = false; + $scope.client_loading = true; - $scope.loadClient = function () { + // 前端渲染的end索引 + $scope.endIndexMap = {}; + // 初始化索引是60 + const initEndIndex = 60; + $scope.loadClient = function () { $http.get('/sys/merchant_id').then(function (resp) { - $scope.clientsMap = resp.data; - $scope.client_loading = false; + $scope.clientsMap = resp.data; + $scope.client_loading = false; + + // 加入对应项的end索引值 + // 如果数据小于60，索引值为数据长度 + // 否则设置为60 + for (var key in $scope.clientsMap) { + $scope.endIndexMap[key] = initEndIndex; + var length = $scope.clientsMap[key].length; + if (length <= initEndIndex) + $scope.endIndexMap[key] = length; + + } }); }; - $scope.loadClient(); + $scope.loadClient(); + + /** + * 点击更多加载 + * 判断加60后的索引是否超出数组长度 + * @param key + */ + $scope.more = function(key) { + + var endIndex = $scope.endIndexMap[key] + initEndIndex; + $scope.endIndexMap[key] = endIndex; + + if (endIndex > $scope.clientsMap[key].length) { + $scope.endIndexMap[key] = $scope.clientsMap[key].length; + } - $scope.showClient = function (sub_merchant_id) { + }; + + /** + * 收起 + * @param key + */ + $scope.packup = function(key) { + $scope.endIndexMap[key] = initEndIndex; + var length = $scope.clientsMap[key].length; + if (length <= initEndIndex) + $scope.endIndexMap[key] = length; + }; + + $scope.showClient = function (sub_merchant_id) { if($scope.sub_merchant_id == sub_merchant_id){ return; } @@ -38,6 +80,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS $scope.sub_merchant_id = sub_merchant_id; }); }; + }]); app.controller('noTradeSubMerchantIdCtrl', ['$scope', '$state', '$http','$uibModal', function ($scope, $state, $http,$uibModal) { $scope.pagination = {}; 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 ab9bff83b..608e5bc56 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 @@ -78,44 +78,53 @@
From 05ca4d9a126793e73e392644b07944a91871bad1 Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Fri, 24 Aug 2018 16:20:35 +0800 Subject: [PATCH 03/37] fix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fcc8224a2..351b5ceee 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 0.2.0-dev + 0.2.0 4.0.0 From 09e4092d1fc5cda0c148ada9d756fc3697260e35 Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Tue, 28 Aug 2018 12:04:57 +0800 Subject: [PATCH 04/37] fix settle hour --- .../payment/manage/merchants/entity/impls/SettleHourModify.java | 2 +- src/main/ui/static/payment/partner/partner-manage.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/SettleHourModify.java b/src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/SettleHourModify.java index ba474a4eb..8951f5294 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/SettleHourModify.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/SettleHourModify.java @@ -8,7 +8,7 @@ import com.alibaba.fastjson.JSONObject; * Create by yixian at 2018-04-12 16:43 */ public class SettleHourModify extends ClientConfigModify { - private int settle_hour; + private Integer settle_hour; public SettleHourModify(JSONObject account, String clientMoniker, Integer settle_hour) { super(account, clientMoniker); diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 0084d5263..a8bfba833 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -1728,7 +1728,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.getBankAccount(); }) }; - $scope.settleHours = [{value: 24, label: 'Default(24:00, GMT+10)'}]; + $scope.settleHours = [{value: undefined, label: 'Default(24:00, GMT+10)'}]; for (var h = 24; h > 0; h--) { $scope.settleHours.push({value: h, label: ('00' + h).substr(-2) + ':00, ' + $scope.partner.timezone}); } From 2618572c287dd3ecc5fa3308485969326182364e Mon Sep 17 00:00:00 2001 From: yixian Date: Wed, 29 Aug 2018 09:18:55 +0800 Subject: [PATCH 05/37] document fix --- src/document/en/apis.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/document/en/apis.js b/src/document/en/apis.js index f7e18b05f..a09a8949e 100644 --- a/src/document/en/apis.js +++ b/src/document/en/apis.js @@ -562,7 +562,7 @@ * @apiUse GlobalError */ /** - * @api {GET} /api/v1.0/gateway/partners/{partner_code}/transactions Query Settlement Details + * @api {GET} /api/v1.0/gateway/partners/{partner_code}/settlements Query Settlement Details * @apiName SettleLog * @apiGroup CommonApi * @apiVersion 1.0.0 From 38ce88773ff1ca3aee210e24603264b0861a6f1d Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Thu, 30 Aug 2018 15:37:05 +0800 Subject: [PATCH 06/37] =?UTF-8?q?fix=20=E7=A6=81=E7=94=A8=E5=95=86?= =?UTF-8?q?=E6=88=B7=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/payment/partner/templates/partners.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/ui/static/payment/partner/templates/partners.html b/src/main/ui/static/payment/partner/templates/partners.html index a1caff67c..4121cdd6b 100644 --- a/src/main/ui/static/payment/partner/templates/partners.html +++ b/src/main/ui/static/payment/partner/templates/partners.html @@ -481,9 +481,9 @@ - (已禁用) + - + (已禁用) Date: Tue, 4 Sep 2018 09:52:13 +0800 Subject: [PATCH 07/37] add Hf shortURL update --- .../payment/manage/merchants/core/impls/ClientManagerImpl.java | 1 + 1 file changed, 1 insertion(+) 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 e0b1a47da..c28077c22 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 @@ -3758,6 +3758,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } } clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager, clientMoniker, "enable_link", allow)); + clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager, clientMoniker, "enable_hf", allow)); } From be79766deb26613012a84686ac2bca2f7ed49ce4 Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Tue, 4 Sep 2018 15:35:39 +0800 Subject: [PATCH 08/37] update --- .../manage/dev/core/impl/HfUpdateImpl.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java index 67c1a0bfa..4d10674de 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java @@ -1,30 +1,28 @@ package au.com.royalpay.payment.manage.dev.core.impl; -import au.com.royalpay.payment.manage.dev.core.HfClearAmountService; import au.com.royalpay.payment.manage.dev.core.HfUpdateService; -import au.com.royalpay.payment.manage.mappers.payment.TransactionMapper; +import au.com.royalpay.payment.manage.mappers.system.ClientConfigMapper; import au.com.royalpay.payment.manage.mappers.system.ClientMapper; import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi; import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider; import au.com.royalpay.payment.tools.env.PlatformEnvironment; -import au.com.royalpay.payment.tools.exceptions.ServerErrorException; -import com.alibaba.fastjson.JSONArray; + import com.alibaba.fastjson.JSONObject; -import com.google.gson.JsonArray; -import org.apache.commons.lang3.time.DateUtils; + import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.text.ParseException; import java.util.List; +import javax.annotation.Resource; + @Service public class HfUpdateImpl implements HfUpdateService { @Resource private ClientMapper clientMapper; @Resource private MpWechatApiProvider mpWechatApiProvider; + @Resource + private ClientConfigMapper clientConfigMapper; @Override public String updateStatus() { @@ -32,8 +30,14 @@ public class HfUpdateImpl implements HfUpdateService { clientIds.forEach(dbResult -> { String longUrl = PlatformEnvironment.getEnv().concatUrl("/api/v1.0/hf_gateway/partners/" + dbResult.getString("client_moniker") + "/jump/pc"); MpWechatApi api = mpWechatApiProvider.getNewPaymentApi(); - dbResult.put("hf_pay_url", api.registerShortUrl(longUrl)); + String url = api.registerShortUrl(longUrl); + dbResult.put("hf_pay_url", url); + JSONObject config = new JSONObject(); + config.put("client_id",dbResult.getString("client_id")); + config.put("hf_pay_url", url); + clientConfigMapper.update(config); clientMapper.update(dbResult); + }); return "ok"; } From 4d3bd00ea4d4cf5f2cf3357ef75f0f0a6d06b2f2 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 4 Sep 2018 15:46:06 +0800 Subject: [PATCH 09/37] fix hf qrcode --- .../manage/merchants/core/impls/ClientManagerImpl.java | 3 ++- .../static/payment/partner/templates/client_payment_info.html | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) 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 c28077c22..9930d0d8f 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 @@ -414,7 +414,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid //HF支付链接二维码 if (client.getString("hf_pay_url") != null) { - client.put("hfQrcodeUrl", QRCodeUtils.qrcodeImageCode(client.getString("hf_pay_url"), 200, false)); + String hfQrcodeUrl = PlatformEnvironment.getEnv().concatUrl("/api/v1.0/hf_gateway/partners/" + client.getString("client_moniker") + "/jump/app"); + client.put("hfQrcodeUrl", QRCodeUtils.qrcodeImageCode(hfQrcodeUrl, 200, false)); } return client; } diff --git a/src/main/ui/static/payment/partner/templates/client_payment_info.html b/src/main/ui/static/payment/partner/templates/client_payment_info.html index b9c7901af..0925c1372 100644 --- a/src/main/ui/static/payment/partner/templates/client_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/client_payment_info.html @@ -103,7 +103,7 @@

{{partner.hf_pay_url}} - +

From af2ec66f48d96fbbd0026405ab1f85cfaa81bc57 Mon Sep 17 00:00:00 2001 From: yangkai Date: Tue, 4 Sep 2018 16:40:13 +0800 Subject: [PATCH 10/37] update --- .../core/impls/RetailAppServiceImp.java | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 371db155a..8ad7cf913 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -775,33 +775,6 @@ public class RetailAppServiceImp implements RetailAppService { TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time"); ArrayList date_contains = new ArrayList<>(); for (JSONObject order : orders) { - String customer_id = order.getString("customer_id"); - if (StringUtils.isEmpty(customer_id)) { - continue; - } - switch (order.getString("channel")) { - case "Alipay": - JSONObject alipayUser = managerCustomerRelationAlipayMapper.findCustomerByUserId(customer_id); - if (alipayUser != null) { - order.put("nickname", alipayUser.getString("nickname")); - order.put("headimg", alipayUser.getString("headimg")); - } - break; - case "Wechat": - JSONObject weUser = new JSONObject(); - if (customer_id.startsWith("olH")) { - weUser = customerMapper.findCustomerGlobalpayByOpenId(customer_id); - } else { - weUser = customerMapper.findCustomerByOpenId(customer_id); - } - if (weUser != null && !weUser.isEmpty()) { - order.put("nickname", weUser.getString("nickname")); - order.put("headimg", weUser.getString("headimg")); - } - break; - default: - break; - } Calendar calendar = (Calendar) order.get("transaction_time"); String trade_date = DateFormatUtils.format(calendar, "yyyy-MM-dd", calendar.getTimeZone()); String trade_time = DateFormatUtils.format(calendar, "HH:mm:ss", calendar.getTimeZone()); @@ -831,6 +804,33 @@ public class RetailAppServiceImp implements RetailAppService { order.put("date_total", analysis); date_contains.add(trade_date); } + String customer_id = order.getString("customer_id"); + if (StringUtils.isEmpty(customer_id)) { + continue; + } + switch (order.getString("channel")) { + case "Alipay": + JSONObject alipayUser = managerCustomerRelationAlipayMapper.findCustomerByUserId(customer_id); + if (alipayUser != null) { + order.put("nickname", alipayUser.getString("nickname")); + order.put("headimg", alipayUser.getString("headimg")); + } + break; + case "Wechat": + JSONObject weUser = new JSONObject(); + if (customer_id.startsWith("olH")) { + weUser = customerMapper.findCustomerGlobalpayByOpenId(customer_id); + } else { + weUser = customerMapper.findCustomerByOpenId(customer_id); + } + if (weUser != null && !weUser.isEmpty()) { + order.put("nickname", weUser.getString("nickname")); + order.put("headimg", weUser.getString("headimg")); + } + break; + default: + break; + } } return PageListUtils.buildPageListResult(orders); } From ca9fa4b2ddb8d092d7668fafc688336dc8cf7dc4 Mon Sep 17 00:00:00 2001 From: hellolujian <1370256381@qq.com> Date: Tue, 4 Sep 2018 16:54:57 +0800 Subject: [PATCH 11/37] =?UTF-8?q?[fix]=E6=96=B0=E5=A2=9E=E7=BB=84=E7=BB=87?= =?UTF-8?q?state=E9=80=89=E9=A1=B9=E6=B7=BB=E5=8A=A0=E5=85=B6=E4=BB=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/commons/services/stateMap.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/ui/static/commons/services/stateMap.js b/src/main/ui/static/commons/services/stateMap.js index 26daae717..abe310342 100644 --- a/src/main/ui/static/commons/services/stateMap.js +++ b/src/main/ui/static/commons/services/stateMap.js @@ -8,7 +8,8 @@ define(['../app'], function (app) { {"label": "SA", "value": "SA"}, {"label": "TAS", "value": "TAS"}, {"label": "VIC","value": "VIC"}, - {"label": "WA", "value": "WA"} + {"label": "WA", "value": "WA"}, + {"label": "其他(Others)", "value": "其他(Others)"} ]; app.factory('stateMap', function () { return { From ca0d44e9f3daf676482b05b4850233e00d09797f Mon Sep 17 00:00:00 2001 From: hellolujian <1370256381@qq.com> Date: Tue, 4 Sep 2018 16:58:06 +0800 Subject: [PATCH 12/37] =?UTF-8?q?[fix]=E6=96=B0=E5=A2=9E=E7=BB=84=E7=BB=87?= =?UTF-8?q?state=E9=80=89=E9=A1=B9=E6=B7=BB=E5=8A=A0=E5=85=B6=E4=BB=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/commons/services/stateMap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/commons/services/stateMap.js b/src/main/ui/static/commons/services/stateMap.js index abe310342..78ce7a58b 100644 --- a/src/main/ui/static/commons/services/stateMap.js +++ b/src/main/ui/static/commons/services/stateMap.js @@ -9,7 +9,7 @@ define(['../app'], function (app) { {"label": "TAS", "value": "TAS"}, {"label": "VIC","value": "VIC"}, {"label": "WA", "value": "WA"}, - {"label": "其他(Others)", "value": "其他(Others)"} + {"label": "其他(Other)", "value": "其他(Other)"} ]; app.factory('stateMap', function () { return { From ad3f353e495b7cafe565dfc3a9305d7162ce42ba Mon Sep 17 00:00:00 2001 From: yangkai Date: Tue, 4 Sep 2018 19:52:18 +0800 Subject: [PATCH 13/37] =?UTF-8?q?update:=E6=B1=87=E4=BB=98=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=82=AE=E4=BB=B6=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/manage/merchants/core/impls/ClientManagerImpl.java | 3 ++- src/main/resources/templates/mail/hf_email_notice.html | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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 9930d0d8f..da95e6eea 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 @@ -3779,7 +3779,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid ctx.setVariable("name", client.getString("contact_person")); ctx.setVariable("order_id", order.getString("order_id")); ctx.setVariable("amount", order.getString("total_amount")); - ctx.setVariable("time", order.getString("create_time")); + String create_time = DateFormatUtils.format(order.getDate("create_time"), "yyyy-MM-dd HH:mm:ss"); + ctx.setVariable("time", create_time); final String content = thymeleaf.process( "mail/hf_email_notice", ctx); final String mailTo = client.getString("contact_email"); if (StringUtils.isEmpty(mailTo)) { diff --git a/src/main/resources/templates/mail/hf_email_notice.html b/src/main/resources/templates/mail/hf_email_notice.html index f0059fbf0..d7f5e6275 100644 --- a/src/main/resources/templates/mail/hf_email_notice.html +++ b/src/main/resources/templates/mail/hf_email_notice.html @@ -15,6 +15,7 @@

RoyalPay到账提醒：

-
-
Total Amount:
-
- -   Amounts: - -
-
+ ng-repeat=" (key, group) in batchAnalysis[analysisFilter.clearing_id==null?'All':analysisFilter.clearing_id+'']">
T+{{group.settleDays}}: Clients:{{group.clients}} Amount:{{group.settleAmount|currency:''}} @@ -201,7 +193,7 @@ - + @@ -225,13 +217,19 @@ - - - 全部 + + + 更多 - - 收起 +     + + 全部 + + 收起 +
From 60586c9d4d987143cd5508e27587e0dc557abe59 Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Thu, 6 Sep 2018 15:08:45 +0800 Subject: [PATCH 25/37] fixbug parent client invalid --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 351b5ceee..fcc8224a2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 0.2.0 + 0.2.0-dev 4.0.0 From 7a0bfcab9afd4b08ebc583d15d59e0ec9035d280 Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Thu, 6 Sep 2018 17:39:09 +0800 Subject: [PATCH 26/37] test HF --- src/main/ui/static/templates/hf/gateway_payment.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/ui/static/templates/hf/gateway_payment.js b/src/main/ui/static/templates/hf/gateway_payment.js index 530feedd7..724f6a568 100644 --- a/src/main/ui/static/templates/hf/gateway_payment.js +++ b/src/main/ui/static/templates/hf/gateway_payment.js @@ -93,6 +93,8 @@ var productList = [ {label:'进口食品',value:'100044'}, {label:'休闲食品',value:'100045'}, {label:'营养品',value:'100046'}, - {label:'地方特产',value:'100047'} + {label:'地方特产',value:'100047'}, + {label:'机票',value:'400003'}, + {label:'酒店',value:'400004'}, + {label:'当地旅游费用',value:'400005'} ]; - From de4aee60edbe1e01a93c83fbe91215f2d80a95a1 Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Thu, 6 Sep 2018 17:47:41 +0800 Subject: [PATCH 27/37] update hf industry --- .../ui/static/templates/hf/gateway_payment.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/ui/static/templates/hf/gateway_payment.js b/src/main/ui/static/templates/hf/gateway_payment.js index 724f6a568..a7e9bc092 100644 --- a/src/main/ui/static/templates/hf/gateway_payment.js +++ b/src/main/ui/static/templates/hf/gateway_payment.js @@ -94,7 +94,22 @@ var productList = [ {label:'休闲食品',value:'100045'}, {label:'营养品',value:'100046'}, {label:'地方特产',value:'100047'}, + {label:'游戏点卡',value:'200003'}, + {label:'游戏周边',value:'200004'}, + {label:'网页游戏',value:'200005'}, + {label:'手机游戏',value:'200006'}, + {label:'电脑杀毒软件',value:'200007'}, + {label:'电脑安装软件',value:'200008'}, + {label:'虚拟服务租赁',value:'200009'}, + {label:'物理服务器租赁',value:'200010'}, + {label:'国际线路租赁',value:'200011'}, + {label:'域名',value:'200012'}, + {label:'网页设计',value:'200013'}, + {label:'软件设计',value:'200014'}, + {label:'留学学费',value:'300003'}, + {label:'出国夏令营费用',value:'300004'}, {label:'机票',value:'400003'}, {label:'酒店',value:'400004'}, - {label:'当地旅游费用',value:'400005'} + {label:'当地旅游费用',value:'400005'}, ]; + From dd2d72e1771ab4c6516f76637a449ce6f38b694b Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Thu, 6 Sep 2018 17:49:14 +0800 Subject: [PATCH 28/37] update hf industry --- src/main/ui/static/templates/hf/gateway_payment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/templates/hf/gateway_payment.js b/src/main/ui/static/templates/hf/gateway_payment.js index a7e9bc092..845a8ad45 100644 --- a/src/main/ui/static/templates/hf/gateway_payment.js +++ b/src/main/ui/static/templates/hf/gateway_payment.js @@ -110,6 +110,6 @@ var productList = [ {label:'出国夏令营费用',value:'300004'}, {label:'机票',value:'400003'}, {label:'酒店',value:'400004'}, - {label:'当地旅游费用',value:'400005'}, + {label:'当地旅游费用',value:'400005'} ]; From 0670a41ee948c6f5d0c0095228c312b41b9b9ce2 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 6 Sep 2018 17:53:44 +0800 Subject: [PATCH 29/37] fix clearing --- .../analysis/templates/settlement_detail.html | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/ui/static/analysis/templates/settlement_detail.html b/src/main/ui/static/analysis/templates/settlement_detail.html index b2ae518de..2ed74b957 100644 --- a/src/main/ui/static/analysis/templates/settlement_detail.html +++ b/src/main/ui/static/analysis/templates/settlement_detail.html @@ -175,7 +175,8 @@
T+{{group.settleDays}}: Clients:{{group.clients}} Amount:{{group.settleAmount|currency:''}} - Click to hide + Click to show + Click to hide
@@ -217,17 +218,20 @@
- - + + 更多 -     - + + + | + + 全部 - + 收起 From 4a36fa5cc0488044e16fbe9b6f1534a0215cf877 Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Thu, 6 Sep 2018 18:29:38 +0800 Subject: [PATCH 30/37] maven --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fcc8224a2..351b5ceee 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 0.2.0-dev + 0.2.0 4.0.0 From 0679f626cefe5b6edde9788ff1b2a44e3464bd02 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 7 Sep 2018 10:00:46 +0800 Subject: [PATCH 31/37] fix clearing --- src/main/ui/static/analysis/clearing-log.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js index 4ee3f2e49..cb1429ab3 100644 --- a/src/main/ui/static/analysis/clearing-log.js +++ b/src/main/ui/static/analysis/clearing-log.js @@ -283,7 +283,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func $scope.packup = function(key) { $scope.endIndexMap[key] = $scope.initEndIndex; - var length = $scope.clientsMap[key]; + var length = $scope.clientsMap[key].clients; if (length <= $scope.initEndIndex) $scope.endIndexMap[key] = length; }; From b4f595c34c57eec7f15297734c8d3a69895afe5d Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Fri, 7 Sep 2018 10:21:17 +0800 Subject: [PATCH 32/37] add settle mail --- .../clearing/core/impl/CleanServiceImpl.java | 42 +++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java index b419e9a95..28229651f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java @@ -4,7 +4,11 @@ import au.com.royalpay.payment.core.PaymentApi; import au.com.royalpay.payment.core.exceptions.InvalidShortIdException; import au.com.royalpay.payment.core.tasksupport.SettlementSupport; import au.com.royalpay.payment.manage.management.clearing.core.CleanService; -import au.com.royalpay.payment.manage.mappers.log.*; +import au.com.royalpay.payment.manage.mappers.log.ClearingDetailAnalysisMapper; +import au.com.royalpay.payment.manage.mappers.log.ClearingDetailMapper; +import au.com.royalpay.payment.manage.mappers.log.ClearingLogMapper; +import au.com.royalpay.payment.manage.mappers.log.LogSettleMailMapper; +import au.com.royalpay.payment.manage.mappers.log.ValidationLogMapper; import au.com.royalpay.payment.manage.mappers.payment.TaskManualSettleMapper; import au.com.royalpay.payment.manage.mappers.payment.TransactionMapper; import au.com.royalpay.payment.manage.mappers.system.CalendarMapper; @@ -33,12 +37,14 @@ import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.tools.tasksupport.TaskFinishNotifyEvent; import au.com.royalpay.payment.tools.utils.PageListUtils; import au.com.royalpay.payment.tools.utils.TimeZoneUtils; + import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; + import org.apache.commons.codec.binary.Base64; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVPrinter; @@ -47,7 +53,12 @@ import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; -import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Font; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.joda.time.DateTime; import org.joda.time.Days; @@ -65,20 +76,37 @@ import org.springframework.util.CollectionUtils; import org.thymeleaf.context.Context; import org.thymeleaf.spring4.SpringTemplateEngine; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.Writer; import java.math.BigDecimal; import java.math.RoundingMode; import java.net.URISyntaxException; import java.text.DecimalFormat; import java.text.NumberFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Currency; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.TreeMap; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; + import static au.com.royalpay.payment.manage.permission.utils.OrgCheckUtils.checkOrgPermission; /** @@ -990,7 +1018,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider // String mailId = mailService.sendEmail(title, "164851225@qq.com", "1029811920@qq.com", content, // attachList); String mailId = mailService.sendEmail(title, "diana.baldi@flexewallet.com,steven.stamboultgis@novatti.com,fazal.cader@flexewallet.com", - "locky@royalpay.com.au,leo.huang@royalpay.com.au,eason.qian@royalpay.com.au,astro.dai@royalpay.com.au,settlement@royalpay.com.au,settlements@flexewallet.com", + "locky@royalpay.com.au,leo.huang@royalpay.com.au,eason.qian@royalpay.com.au,astro.dai@royalpay.com.au,settlement@royalpay.com.au,settlements@flexewallet.com,ben.evans@royalpay.com.au", content, attachList); if (settleMail == null) { From 01d5c6129dee507e900d6486faf6f51d4615a8ba Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Fri, 7 Sep 2018 10:35:05 +0800 Subject: [PATCH 33/37] log --- .../analysis/core/impls/EstimateAnalysisServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java index 1fedfab93..2dc8f4195 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java @@ -154,6 +154,7 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService { DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); //T1 ok JSONObject dayInfo = new JSONObject(); + dayInfo.put("platformGetSettleFee", BigDecimal.ZERO); String endStr = DateFormatUtils.format(date, "yyyy/MM/dd"); JSONObject maxDays = estimateAnalysisMapper.findMaxCleanDays(endStr); String end_date = maxDays.getString("date_str"); @@ -172,9 +173,10 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService { } List alipayOnlineSettleLogs = platformSettlementMapper.findBySettleDate(new Date(estimateAnalysisMapper.findLastCleanDays(end_date, 1).getDate("date_str").getTime()), "AlipayOnline"); + logger.info(" Estimate alipayOnlineSettleLogs is :{}", alipayOnlineSettleLogs.toString()); for (JSONObject logs : alipayOnlineSettleLogs) { dayInfo.put("aliOnlineSettleFee_" + logs.getString("merchants"), logs.getBigDecimal("settlement_fee")); - dayInfo.put("platformGetSettleFee",dayInfo.getBigDecimal("platformGetSettleFee").add(dayInfo.getBigDecimal("aliOnlineSettleFee_" + logs.getString("merchants")))); + dayInfo.put("platformGetSettleFee", dayInfo.getBigDecimal("platformGetSettleFee").add(dayInfo.getBigDecimal("aliOnlineSettleFee_" + logs.getString("merchants")))); } cleanDays.clear(); From 24b286198c49afa84cf8a8e7937cd238bea504cd Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Fri, 7 Sep 2018 10:49:24 +0800 Subject: [PATCH 34/37] update --- .../clearing/core/impl/CleanServiceImpl.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java index 28229651f..c99cf7636 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java @@ -29,6 +29,7 @@ import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider; import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage; import au.com.royalpay.payment.tools.defines.TradeType; import au.com.royalpay.payment.tools.env.PlatformEnvironment; +import au.com.royalpay.payment.tools.env.SysConfigManager; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import au.com.royalpay.payment.tools.exceptions.NotFoundException; @@ -153,6 +154,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider private SpringTemplateEngine thymeleaf; @Resource private ClientConfigService clientConfigService; + @Resource + private SysConfigManager sysConfigManager; @Value("${app.settlement.email-to}") private String settlementEmailTo; @@ -969,11 +972,6 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider String title = "Royalpay Settlement File " + DateFormatUtils.format(date, "yyyyMMdd"); JSONObject model = new JSONObject(); model.put("date", DateFormatUtils.format(date, "dd-MM-yyyy")); - // todo themeleaf - - - // final String content = VelocityEngineUtils.mergeTemplateIntoString(velocityEngine, - // "mail/settlement_mail.vm", "utf-8", model); String fileName1 = "Merchant_Settlement_Info_xlsx_" + DateFormatUtils.format(date, "yyyyMMdd"); List attachList = new ArrayList<>(); JSONObject attach1 = new JSONObject(); @@ -1017,9 +1015,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider // 测试用地址 // String mailId = mailService.sendEmail(title, "164851225@qq.com", "1029811920@qq.com", content, // attachList); - String mailId = mailService.sendEmail(title, "diana.baldi@flexewallet.com,steven.stamboultgis@novatti.com,fazal.cader@flexewallet.com", - "locky@royalpay.com.au,leo.huang@royalpay.com.au,eason.qian@royalpay.com.au,astro.dai@royalpay.com.au,settlement@royalpay.com.au,settlements@flexewallet.com,ben.evans@royalpay.com.au", - content, attachList); + JSONObject config = sysConfigManager.getSysConfig(); + String mailId = mailService.sendEmail(title, config.getString("settle_mail_to"),config.getString("settle_mail_cc"), content, attachList); if (settleMail == null) { JSONObject settleMailRecord = new JSONObject(); From 8e65c89875214662b8456abbd103ffa1c672d881 Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Fri, 7 Sep 2018 10:52:24 +0800 Subject: [PATCH 35/37] maven --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 351b5ceee..fcc8224a2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 0.2.0 + 0.2.0-dev 4.0.0 From 384475da74ef456b819e14c50145de03dd925c92 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 7 Sep 2018 14:22:32 +0800 Subject: [PATCH 36/37] add partnerInfo - copy icon --- .../static/payment/partner/partner-manage.js | 10 +++++++ src/main/ui/static/payment/partner/partner.js | 12 +++++++++ .../templates/client_payment_info.html | 27 +++++++++++-------- .../templates/partner_payment_info.html | 2 ++ 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 51dcb649d..8aced4d4e 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -1195,6 +1195,16 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }]); app.controller('partnerPaymentInfoCtrl', ['$scope', '$http', '$state', 'commonDialog','$uibModal', '$sce', function ($scope, $http, $state, commonDialog,$uibModal, $sce) { $scope.refresh = false; + $scope.copyHfLink = function() { + var e=document.getElementById("cpbt"); + e.select(); + var successful = document.execCommand("Copy"); + if (successful) { + commonDialog.alert({title: 'Success', content: '已复制到剪切板!', type: 'success'}); + }else { + commonDialog.alert({title: 'Error', content: '您的浏览器不支持!', type: 'error'}); + } + }; $scope.loadPartnerPaymentInfo = function () { $http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) { $scope.paymentInfo = resp.data; diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js index 9e5a7e7d8..12fe7c3ce 100644 --- a/src/main/ui/static/payment/partner/partner.js +++ b/src/main/ui/static/payment/partner/partner.js @@ -557,6 +557,18 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct $scope.paymentInfo = $scope.partner; $scope.old_customer_surcharge_rate = angular.copy($scope.partner.customer_surcharge_rate); $scope.qrConfig = {currency: 'AUD'}; + + $scope.clientCopyHfLink = function() { + var e=document.getElementById("c-cpbt"); + e.select(); + var successful = document.execCommand("Copy"); + if (successful) { + commonDialog.alert({title: 'Success', content: '已复制到剪切板!', type: 'success'}); + }else { + commonDialog.alert({title: 'Error', content: '您的浏览器不支持!', type: 'error'}); + } + }; + $scope.reloadQRCode = function () { $http.get('/client/partner_info/qrcode', {params: $scope.qrConfig}).then(function (resp) { $scope.qrcode = resp.data; diff --git a/src/main/ui/static/payment/partner/templates/client_payment_info.html b/src/main/ui/static/payment/partner/templates/client_payment_info.html index d9be1de43..98b914b06 100644 --- a/src/main/ui/static/payment/partner/templates/client_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/client_payment_info.html @@ -102,9 +102,11 @@
- -

{{partner.hf_pay_url}} - + + {{partner.hf_pay_url}} + + + + + +

-
- - -
- 仅支持微信客户端扫描
-
+
+ + +
+ 仅支持微信客户端扫描 +
+
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 bba78c0c4..e4a502704 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 @@ -329,6 +329,8 @@
  {{paymentInfo.hf_pay_url}} + +
From b1946bc75968f6bd49e5c2584253586bdfbaeaf1 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 7 Sep 2018 14:34:42 +0800 Subject: [PATCH 37/37] fix partnerInfo --- .../static/payment/partner/templates/client_payment_info.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/payment/partner/templates/client_payment_info.html b/src/main/ui/static/payment/partner/templates/client_payment_info.html index 98b914b06..b1c2ad043 100644 --- a/src/main/ui/static/payment/partner/templates/client_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/client_payment_info.html @@ -130,7 +130,7 @@
- 仅支持微信客户端扫描 + 仅支持微信客户端扫描