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 8ad7cf913..f8f3a01a9 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 @@ -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 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 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"); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.java index 6aa29ddaa..8f62c7c2b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.java @@ -29,6 +29,5 @@ public interface CouponAccuessLogMapper { @AutoSql(type = SqlType.SELECT) List findCouponByOrderId(@Param("order_id") String order_id); - @AutoSql(type = SqlType.SELECT) - PageList getCouponAccuessLog(@Param("client_id")int client_id, PageBounds pageBounds); + PageList getCouponAccuessLog(@Param("client_id")int client_id, @Param("keyword")String keyword, PageBounds pageBounds); } 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 da95e6eea..030aa8148 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 @@ -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; } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.xml new file mode 100644 index 000000000..784d34e3b --- /dev/null +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/main/ui/static/css/hf_gateway.css b/src/main/ui/static/css/hf_gateway.css index d4a50aba9..9d7afdcef 100644 --- a/src/main/ui/static/css/hf_gateway.css +++ b/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; diff --git a/src/main/ui/static/css/img/rp_logo1.png b/src/main/ui/static/css/img/rp_logo1.png index 7efe373a8..2c69a5195 100644 Binary files a/src/main/ui/static/css/img/rp_logo1.png and b/src/main/ui/static/css/img/rp_logo1.png differ diff --git a/src/main/ui/static/css/img/rp_logo2.png b/src/main/ui/static/css/img/rp_logo2.png new file mode 100644 index 000000000..7efe373a8 Binary files /dev/null and b/src/main/ui/static/css/img/rp_logo2.png differ 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 0925c1372..d9be1de43 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,8 +102,9 @@
-

{{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 80558c3a0..bba78c0c4 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 @@ -328,14 +328,14 @@
-   {{paymentInfo.hf_pay_url}} +   {{paymentInfo.hf_pay_url}}
- +
-   仅支持微信客户端扫描 +   仅支持微信客户端扫描
diff --git a/src/main/ui/static/templates/hf/css/gateway_payment.css b/src/main/ui/static/templates/hf/css/gateway_payment.css index 5b68bcd22..979b13935 100644 --- a/src/main/ui/static/templates/hf/css/gateway_payment.css +++ b/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; diff --git a/src/main/ui/static/templates/hf/gateway_payment.js b/src/main/ui/static/templates/hf/gateway_payment.js index 044c28dfb..530feedd7 100644 --- a/src/main/ui/static/templates/hf/gateway_payment.js +++ b/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'}, diff --git a/src/main/ui/static/templates/hf/img/ali_pay.png b/src/main/ui/static/templates/hf/img/ali_pay.png new file mode 100644 index 000000000..45ddf74c0 Binary files /dev/null and b/src/main/ui/static/templates/hf/img/ali_pay.png differ diff --git a/src/main/ui/static/templates/hf/img/union_pay.png b/src/main/ui/static/templates/hf/img/union_pay.png new file mode 100644 index 000000000..ed4160c72 Binary files /dev/null and b/src/main/ui/static/templates/hf/img/union_pay.png differ diff --git a/src/main/ui/static/templates/hf/img/wechat_pay.png b/src/main/ui/static/templates/hf/img/wechat_pay.png new file mode 100644 index 000000000..d791d29a0 Binary files /dev/null and b/src/main/ui/static/templates/hf/img/wechat_pay.png differ