Merge branch 'develop'

7 years ago · a0df3ab9ee
parent b05de3e6ef b9c4d60607
commit a0df3ab9ee
7 changed files with 13 additions and 5 deletions
--- 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
@ -434,6 +434,13 @@ public class RetailAppServiceImp implements RetailAppService {
            String trade_time = DateFormatUtils.format(calendar, "HH:mm:ss");
            order.put("trade_date", trade_date);
            order.put("trade_time", trade_time);
+            //todo
+            if ("Debit".equals(order.getString("transaction_type"))){
+                order.put("currency","AUD");
+            }
+            if ("CNY".equals(order.getString("currency"))){
+                order.put("clearing_amount",order.getBigDecimal("total_amount"));
+            }
            if (!date_contains.contains(trade_date)) {
                String re_date = trade_date.replaceAll("-", "");
                TradeLogQuery date_query = new TradeLogQuery();
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@ -637,6 +637,7 @@
        select
        o.order_id,
        o.client_id,
+        o.total_amount,
        o.display_amount,
        o.customer_payment_amount,
        o.coupon_payment_amount,
--- a/src/main/resources/templates/activity/one_dollar_day/merchant_bind.html
+++ b/src/main/resources/templates/activity/one_dollar_day/merchant_bind.html
@ -16,7 +16,7 @@
    <script type="text/javascript" src="/static/templates/disable_wechat_menu.js?t=201607070231"></script>
 </head>
 <body>
-<img src="/static/images/logo640x640.jpg" style="width: 60%;display: block;margin: auto">
+<img src="/static/images/logo_new.jpg" style="width: 60%;display: block;margin: auto">
 <h3>身份绑定已完成，奖励将随后发出，敬请留意微信通知</h3>
 </body>
 </html>
--- a/src/main/resources/templates/mail/reset_password.html
+++ b/src/main/resources/templates/mail/reset_password.html
@ -10,7 +10,7 @@
                        <table class="logo" style="margin-bottom: 10px;">
                            <tbody><tr>
                                <td>
-                                    <img src="https://mpay.royalpay.com.au/static/images/logo640x640.jpg" height="100" width="100" border="0" style="display: block;">
+                                    <img src="https://mpay.royalpay.com.au/static/images/logo_new.jpg" height="100" width="100" border="0" style="display: block;">
                                </td>
                            </tr>
                            </tbody></table>
--- a/src/main/resources/templates/paynotice.html
+++ b/src/main/resources/templates/paynotice.html
@ -56,7 +56,7 @@
            <img data-th-src="@{${client['logo_url']}}" id="buslogo" class="logo" style="max-height: 120px;">
        </div>
        <div th:unless="${client['logo_url']}">
-            <img src="/static/images/logo640x640.jpg" id="buslogo" class="logo" style="max-height: 120px;">
+            <img src="/static/images/logo_new.jpg" id="buslogo" class="logo" style="max-height: 120px;">
        </div>
    </div>

--- a/src/main/resources/templates/refund_status.html
+++ b/src/main/resources/templates/refund_status.html
@ -52,7 +52,7 @@
            <img data-th-src="@{${client['logo_url']}}" id="buslogo" class="logo">
        </div>
        <div th:if="${client.logo_url==null} or ${client.logo_url==''}">
-            <img src="/static/images/logo640x640.jpg" id="buslogo" class="logo">
+            <img src="/static/images/logo_new.jpg" id="buslogo" class="logo">
        </div>
    </div>

--- a/src/main/ui/static/analysis/partner_card.js
+++ b/src/main/ui/static/analysis/partner_card.js
@ -37,7 +37,7 @@ define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angul
                $http.get('/analysis/partner_card/' + clientMoniker + '/basic_info').then(function (resp) {
                    $scope.basicinfo = resp.data;
                    if ($scope.basicinfo.logo_url == null) {
-                        $scope.basicinfo.logo_url = "/static/images/logo640x640.jpg";
+                        $scope.basicinfo.logo_url = "/static/images/logo_new.jpg";
                    }
                });
            }