Merge branch 'develop'

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -457,12 +457,13 @@ public class RetailAppServiceImp implements RetailAppService {
 
     @Override
     public JSONObject getCouponCusCouponLog(String client_moniker, AppQueryBean appQueryBean) {
+        String keyword = "CTRIP_";
         JSONObject client = clientMapper.findClientByMoniker(client_moniker);
         if (client == null) {
             throw new BadRequestException("Partner not exists");
         }
         PageList<JSONObject> cusCouponLogs = couponAccuessLogMapper.getCouponAccuessLog(
-                client.getIntValue("client_id"), new PageBounds(appQueryBean.getPage(), appQueryBean.getLimit(), Order.formString("creation_date.desc")));
+                client.getIntValue("client_id"), keyword, new PageBounds(appQueryBean.getPage(), appQueryBean.getLimit(), Order.formString("creation_date.desc")));
         HashMap<String, JSONObject> couponMap = new HashMap<>();
         for(JSONObject cusCouponLog : cusCouponLogs) {
             cusCouponLog.put("client_moniker", client_moniker);
@@ -487,7 +488,7 @@ public class RetailAppServiceImp implements RetailAppService {
         Date date = new Date();
         couponAccuessLog.put("client_id", client_id);
         couponAccuessLog.put("order_id", "非平台订单");
-        couponAccuessLog.put("coupon_id", coupon_id);
+        couponAccuessLog.put("coupon_id", "CTRIP_"+coupon_id);
         couponAccuessLog.put("customer_openid", "非平台订单");
         couponAccuessLog.put("coupon_deal_amount", 0);
         couponAccuessLog.put("currency", "AUD");

src/main/java/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.java

@@ -29,6 +29,5 @@ public interface CouponAccuessLogMapper {
     @AutoSql(type = SqlType.SELECT)
     List<JSONObject> findCouponByOrderId(@Param("order_id") String order_id);
 
-    @AutoSql(type = SqlType.SELECT)
+    PageList<JSONObject> getCouponAccuessLog(@Param("client_id")int client_id, @Param("keyword")String keyword, PageBounds pageBounds);
-    PageList<JSONObject> getCouponAccuessLog(@Param("client_id")int client_id, PageBounds pageBounds);
 }

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -415,7 +415,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         //HF支付链接二维码
         if (client.getString("hf_pay_url") != null) {
             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));
+            client.put("hfQrcodeUrl", QRCodeUtils.qrcodeImageCode(hfQrcodeUrl, 250, true));
         }
         return client;
     }

src/main/resources/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="au.com.royalpay.payment.manage.mappers.log.CouponAccuessLogMapper">
+    <select id="getCouponAccuessLog" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            accuess_id,client_id,customer_openid,order_id,
+            TRIM(LEADING #{keyword} FROM coupon_id) coupon_id,
+            coupon_deal_amount,min_pay_amount,currency,creation_date,
+            last_update_date,is_valid,transaction_id,transaction_refund_id,refund_id
+        FROM cus_coupon_accuess_log
+        WHERE locate(#{keyword},coupon_id) = 1 AND client_id = #{client_id}
+    </select>
+</mapper>

src/main/ui/static/css/hf_gateway.css

@@ -22,6 +22,7 @@
     text-align: center;
 }
 .head-bar img{
+    width: 396px;
     height: 38px;
     top: 60px;
     margin-top: 40px;

src/main/ui/static/payment/partner/templates/client_payment_info.html

@@ -102,8 +102,9 @@
             <div class="form-group">
                 <label class="control-label col-sm-2">HF Pay Link</label>
                 <div class="col-sm-10">
+                    <a href={{paymentInfo.hf_pay_url}} target="_Blank">
                         <p class="form-control-static">{{partner.hf_pay_url}}
-<!--                        <span id="intro">
+                        <span id="intro">
                                 <a href=""><i id="carousel_id"  class="glyphicon glyphicon-info-sign" ng-mouseover="toFirst();toShow()"></i></a>
                                  <div class="pos" ng-show="show">
                                        <i class="tocancle glyphicon glyphicon-remove" ng-click="toHide()"></i>
@@ -116,14 +117,15 @@
                                     </uib-slide>
                                     </uib-carousel>
                                 </div>
-                        </span>-->
+                        </span>
                     </p>
+                </a>
              </div>
-        <div class="form-group"  >
+        <div >
             <label class="col-sm-2 control-label">HF Pay QR Code</label>
-            <img ng-src="{{partner.hfQrcodeUrl}}" class="img-responsive">
+            <img ng-src="{{partner.hfQrcodeUrl}}" class="img-responsive" />
             <div>
-                &nbsp;&nbsp;<span style="padding-left: 18.5%;font-size:9px;">仅支持微信客户端扫描</span>
+                <span style="padding-left: 19.3%;font-size:9px;">仅支持微信客户端扫描</span>
             </div>
         </div>
             </div>

src/main/ui/static/payment/partner/templates/partner_payment_info.html

@@ -328,14 +328,14 @@
                 <label class="col-sm-2 control-label">HF Pay Link</label>
                 <div class="col-sm-10">
                     <input type="checkbox" ng-model="paymentInfo.enable_link" bs-switch switch-change="toggleHfLink('hf')">
-                    &nbsp;&nbsp;<span ng-if="paymentInfo.enable_link">{{paymentInfo.hf_pay_url}}</span>
+                    &nbsp;&nbsp;<a href={{paymentInfo.hf_pay_url}} target="_Blank"><span ng-if="paymentInfo.enable_link">{{paymentInfo.hf_pay_url}}</span></a>
                 </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">
+                    <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>
+                    &nbsp;&nbsp;<span style="padding-left: 19.2%;font-size:9px;" ng-if="paymentInfo.enable_link">仅支持微信客户端扫描</span>
                 </div>
             </div>
             <div class="form-group" ng-if="paymentInfo.enable_hf">

src/main/ui/static/templates/hf/css/gateway_payment.css

@@ -150,12 +150,12 @@ select {
 
 .main-middle {
 	width: 2px;
-	height: 306px;
+	height: 400px;
 	border: 1px dashed #EBEBEB;
 	display: inline-block;
 	box-sizing: border-box;
 	vertical-align: top;
-	margin: 47px 40px 0 0;
+	margin: 10px 40px 0 0;
 }
 .main-right {
 	vertical-align: top;

src/main/ui/static/templates/hf/gateway_payment.js

@@ -29,7 +29,6 @@ select.bind("change", function () {
 });
 var bankList = [
     {label:'招商银行',value:'CMB'},
-    {label:'中国工商银行',value:'ICBC'},
     {label:'中国农业银行',value:'ABC'},
     {label:'中国建设银行',value:'CCB'},
     {label:'中国银行',value:'BOC'},
@@ -46,11 +45,8 @@ var bankList = [
     {label:'北京农商银行',value:'BJRCB'},
     {label:'南京银行',value:'NJCB'},
     {label:'中国光大银行',value:'CEB'},
-    {label:'浙商银行',value:'CZB'},
-    {label:'兴业银行',value:'CIB'},
-    {label:'杭州银行',value:'HZB'},
     {label:'平安银行',value:'PAB'},
-    {label:'上海银行',value:'SHB'},
+    {label:'上海银行',value:'SHB'}
 ];
 var productList = [
     {label:'护肤品',value:'100003'},