From cda8c017ad01212d3c052380982c088ded07e318 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 3 Sep 2018 17:49:37 +0800
Subject: [PATCH] add HF Qrocde & change HF shortURL

---
 .../manage/merchants/core/impls/ClientManagerImpl.java     | 7 ++++++-
 .../payment/partner/templates/partner_payment_info.html    | 7 +++++++
 2 files changed, 13 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 e02809dac..97a9ed3da 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
@@ -411,6 +411,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (audit_logs != null && !audit_logs.isEmpty()) {
             client.put("audit_logs", audit_logs);
         }
+
+        //HF支付链接二维码
+        if (client.getString("hf_pay_url") != null) {
+            client.put("hfQrcodeUrl", QRCodeUtils.qrcodeImageCode(client.getString("hf_pay_url"), 200, false));
+        }
         return client;
     }
 
@@ -3782,7 +3787,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
 
     @Override
     public String getShortLink(String clientMoniker) {
-        String longUrl = PlatformEnvironment.getEnv().concatUrl("/api/v1.0/hf_gateway/partners/" + clientMoniker + "/jump");
+        String longUrl = PlatformEnvironment.getEnv().concatUrl("/api/v1.0/hf_gateway/partners/" + clientMoniker + "/jump/pc");
         MpWechatApi api = mpWechatApiProvider.getNewPaymentApi();
         return api.registerShortUrl(longUrl);
     }
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 b795ed76b..80558c3a0 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,13 @@
                     &nbsp;&nbsp;<span ng-if="paymentInfo.enable_link">{{paymentInfo.hf_pay_url}}</span>
                 </div>
             </div>
+            <div class="form-group"  ng-if="paymentInfo.enable_link">
+                <label class="col-sm-2 control-label">HF Pay QR Code</label>
+                    <img ng-src="{{paymentInfo.hfQrcodeUrl}}" class="img-responsive">
+                <div>
+                    &nbsp;&nbsp;<span style="padding-left: 18.5%;font-size:9px;" ng-if="paymentInfo.enable_link">仅支持微信客户端扫描</span>
+                </div>
+            </div>
             <div class="form-group" ng-if="paymentInfo.enable_hf">
                 <label class="col-sm-2 control-label">HF Pay Email Notice</label>
                 <div class="col-sm-10">