update cardpay ui

src/main/ui/static/css/cardpay.css

@@ -0,0 +1,153 @@
+.qrpay-background {
+    position: fixed;
+    background: #f2f2f2;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    left: 0;
+    z-index: -1;
+}
+
+section.content {
+    position: absolute;
+    top: 70px;
+    bottom: 64px;
+    width: 100%;
+    overflow: auto;
+    left: 0;
+}
+
+.qrpay-container {
+    width: 600px;
+    position: relative;
+    display: block;
+    margin: 40px auto;
+    background: #fff;
+    overflow: visible;
+    box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.30);
+}
+
+.qrpay-container .qr-brand {
+    width: 100%;
+    height: 80px;
+    padding-top: 20px;
+}
+
+.qrpay-container .qr-brand.wechat {
+    background: #09bb07;
+}
+
+.qrpay-container .qr-brand.alipay {
+    background: #1eabeb;
+}
+
+.qrpay-container .qr-brand > .wechat-logo {
+    display: block;
+    margin: auto;
+    height: 40px;
+}
+
+.qrpay-container .price-box {
+    position: relative;
+    display: block;
+    margin: 15px auto;
+    width: 240px;
+}
+
+.qrpay-container .price-box:after {
+    content: '';
+    display: block;
+    clear: both;
+}
+
+.qrpay-container .price-box .exchange-rate {
+    font-size: 16px;
+    display: block;
+}
+
+.qrpay-container .price-box .price {
+    font-size: 22px;
+    float: left;
+    line-height: 28px;
+}
+
+.qrpay-container .price-box .price-left {
+    font-weight: bold;
+    border-right: 2px solid #666;
+    padding-right: 10px;
+}
+
+.qrpay-container .price-box .price-right {
+    padding-left: 10px;
+    width: 49%;
+    white-space: nowrap;
+    text-align: left;
+}
+
+.qrpay-container .card-input-box {
+    width: 100%;
+    height: 400px;
+    margin: auto auto 15px;
+    text-align: center;
+    border: none;
+}
+
+.qrpay-container .qrcode-img {
+    width: 140px;
+    height: 140px;
+    position: relative;
+    display: block;
+    margin: auto;
+}
+
+.qrpay-container .qr-footer {
+    position: relative;
+    bottom: 0;
+    border-radius: 0 0 10px 10px;
+    width: 100%;
+    padding: 10px;
+    background: #f7f7f7;
+    color: #000;
+}
+
+.qrpay-container .qr-footer .form-group {
+    margin-bottom: 2px;
+    font-size: 12px;
+    line-height: 12px;
+}
+
+.qrpay-container .qr-desc {
+    position: absolute;
+    height: 150px;
+    z-index: 999;
+    top: 140px;
+    right: 30px;
+}
+
+#footer {
+    position: absolute;
+    width: 100%;
+    bottom: 0;
+}
+
+@media (max-width: 997px) {
+    section.content {
+        width: 100%;
+        position: relative;
+        bottom: 0;
+        top: 0;
+        overflow: visible;
+    }
+
+    .qrpay-container {
+        width: 100%;
+    }
+
+    #footer {
+        position: relative;
+    }
+
+    .qr-desc {
+        display: none;
+    }
+}

src/main/ui/static/templates/payment/v1/card_pay.js

@@ -1,5 +1,5 @@
 $(function () {
-    let $container = $('.qr-img-box')[0];
+    let $container = $('.card-input-box')[0];
     let cardFrame = window.channel_account_id ? new TokenInputFrame($container, window.channel_account_id) : new CardInputFrame($container);
     cardFrame.onSuccess = function (secretData) {
         $.ajax({
@@ -11,6 +11,10 @@ $(function () {
             }
         })
     };
+    cardFrame.frameStyle = {
+        width: '100%',
+        height: '100%'
+    };
     cardFrame.show();
 
     $('#payBtn').click(function () {

src/test/java/au/com/royalpay/payment/manage/task/RegisterRpPaymentMch.java

@@ -0,0 +1,38 @@
+package au.com.royalpay.payment.manage.task;
+
+import au.com.royalpay.payment.channels.rpaypaymentsvc.runtime.RPayPaymentCardSvcApi;
+import au.com.royalpay.payment.core.beans.EmptyMerchantApplication;
+import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
+import au.com.royalpay.payment.tools.merchants.core.MerchantInfoProvider;
+import com.alibaba.fastjson.JSONObject;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Create by davep at 2020-04-09 18:15
+ */
+@SpringBootTest
+@ActiveProfiles("officedev,wechat,jd,alipay,bestpay,rpay,yeepay,lakala,rppaysvc")
+@RunWith(SpringJUnit4ClassRunner.class)
+public class RegisterRpPaymentMch {
+    @Autowired
+    private RPayPaymentCardSvcApi api;
+    @Autowired
+    private MerchantInfoProvider mchInfoProvider;
+    @Autowired
+    private ManagerMapper managerMapper;
+
+    @Test
+    @Ignore
+    public void register() {
+        JSONObject client = mchInfoProvider.getClientInfo(9);
+        JSONObject manager = managerMapper.findByLoginId("yixian");
+        api.apply(client, new EmptyMerchantApplication(), manager);
+    }
+
+}