From 28eab9a41a0508022072308179fcf3ce0e2be5f1 Mon Sep 17 00:00:00 2001 From: yangkai Date: Fri, 31 Aug 2018 11:27:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E4=BB=98=E6=94=AF=E4=BB=98=E5=AE=8C?= =?UTF-8?q?=E6=88=90=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 --- .../listeners/AfterPaymentFinishListener.java | 5 ++- .../manage/merchants/core/ClientManager.java | 2 + .../core/impls/ClientManagerImpl.java | 38 +++++++++++++++--- .../web/PartnerManageController.java | 5 +++ .../templates/mail/hf_email_notice.html | 31 ++++++++++++++ src/main/ui/static/images/royalpay_logo.png | Bin 0 -> 2873 bytes .../static/payment/partner/partner-manage.js | 21 +++++++++- .../templates/partner_payment_info.html | 6 +++ 8 files changed, 100 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/templates/mail/hf_email_notice.html create mode 100644 src/main/ui/static/images/royalpay_logo.png diff --git a/src/main/java/au/com/royalpay/payment/manage/apps/events/listeners/AfterPaymentFinishListener.java b/src/main/java/au/com/royalpay/payment/manage/apps/events/listeners/AfterPaymentFinishListener.java index 1d498a083..9d53312e8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/apps/events/listeners/AfterPaymentFinishListener.java +++ b/src/main/java/au/com/royalpay/payment/manage/apps/events/listeners/AfterPaymentFinishListener.java @@ -4,6 +4,7 @@ import au.com.royalpay.payment.core.events.AfterPaymentFinishEvent; import au.com.royalpay.payment.manage.customers.core.CustomerPaymentInfoService; import au.com.royalpay.payment.manage.mappers.system.SysCustomerPaymentInfoMapper; +import au.com.royalpay.payment.manage.merchants.core.ClientManager; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; @@ -21,6 +22,8 @@ public class AfterPaymentFinishListener implements ApplicationListener { + try { + mailService.sendEmail("你刚刚有一笔到账信息", client.getString("contact_email"), "", content); + } catch (Exception ignored) { + logger.error("邮件发送失败", ignored); + } + }).start(); + } + @Override public String getShortLink(String clientMoniker) { String longUrl = PlatformEnvironment.getEnv().concatUrl("/api/v1.0/hf_gateway/partners/" + clientMoniker + "/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 5958044d2..d676a3328 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 @@ -546,4 +546,9 @@ public class PartnerManageController { clientManager.switchHfLink(manager, clientMoniker, pass.getBooleanValue("allow")); } + @ManagerMapping(value = "/{clientMoniker}/hf/email_notice", method = RequestMethod.PUT, role = {ManagerRole.OPERATOR, ManagerRole.BD_USER}) + public void switchHfEmailNotice(@PathVariable String clientMoniker, @RequestBody JSONObject pass, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { + clientManager.switchPermission(manager, clientMoniker, "enable_hf_email_notice", pass.getBooleanValue("allow")); + } + } diff --git a/src/main/resources/templates/mail/hf_email_notice.html b/src/main/resources/templates/mail/hf_email_notice.html new file mode 100644 index 000000000..f0059fbf0 --- /dev/null +++ b/src/main/resources/templates/mail/hf_email_notice.html @@ -0,0 +1,31 @@ + + + + + + +
+
+
+ +
+
+

您好，

+

您有一笔收款信息如下：

+
+

RoyalPay到账提醒：

+
    +
  • 订单编号：
    • +
  • 收款金额：
    • +
  • 到账时间：
    • +
+
+ 此致
+ RoyalPay +
+
+ +
+ + + \ No newline at end of file diff --git a/src/main/ui/static/images/royalpay_logo.png b/src/main/ui/static/images/royalpay_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..aad8a6873b1dd3ee610fbf5a1e3d9bb2b4cf0f6b GIT binary patch literal 2873 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 X{B_mN$uh3N00000NkvXXu0mjf(+Z+| literal 0 HcmV?d00001 diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 664a4ad15..51dcb649d 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -1373,7 +1373,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,hf_Link:false}; + $scope.init = {jsapi: false, gateway: false, offline: false, refund: false,common_sub_merchant_id:false, channel: {},gateway_alipay_online:false,hf_Link:false,enable_hf_email_notice:false}; $scope.switchCommonSubMerchantId = function () { if (!$scope.paymentInfo) { return; @@ -1478,6 +1478,25 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }) }; + $scope.toggleHfEmailNotice = function () { + if (!$scope.paymentInfo) { + return; + } + if (!$scope.init.enable_hf_email_notice) { + $scope.init.enable_hf_email_notice = true; + return; + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/hf/email_notice', {allow: $scope.paymentInfo.enable_hf_email_notice}).then(function () { + $scope.loadPartnerPaymentInfo(); + }, function (resp) { + commonDialog.alert({ + title: 'Failed to change enable_hf_email_notice permission status', + content: resp.data.message, + type: 'error' + }); + }) + }; + $scope.toggleJsApi = function () { if (!$scope.paymentInfo) { return; 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 2ec731a81..b795ed76b 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 @@ -331,6 +331,12 @@   {{paymentInfo.hf_pay_url}} +
+ +
+ +
+