网银快捷CSS&JS

src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java

@@ -1236,7 +1236,7 @@ public class TradeLogServiceImpl implements TradeLogService {
             int rowNum = 0;
             Row row = sheet.createRow(rowNum);
             String[] title = {"order Id", "Client Order Id", "Transaction Time", "Channel", "Gateway", "Exchange Rate", "Transaction Type", "Currency",
-                    "Input Amount", "Total Amount", "Clearing Amount", "Sruchange Rate", "Settle Amount", "Remark", "Dev No"};
+                    "Input Amount", "Total Amount", "Clearing Amount", "Sruchange Rate", "Settle Amount", "Remark", "Dev No","Company Name","Short Name","Settment Date"};
             String[] analysis = {"Total Credit", "Total Debit", "Gross Amount", "Total Charge", "Net Amount"};
             for (int i = 0; i < title.length; i++) {
                 row.createCell(i, Cell.CELL_TYPE_STRING).setCellValue(title[i]);
@@ -1275,6 +1275,9 @@ public class TradeLogServiceImpl implements TradeLogService {
                 if (device != null)
                     clientDevId = device.getString("client_dev_id");
                 row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(clientDevId);
+                row.createCell(15,Cell.CELL_TYPE_STRING).setCellValue(settle.getString("company_name"));
+                row.createCell(16,Cell.CELL_TYPE_STRING).setCellValue(settle.getString("short_name"));
+                row.createCell(17,Cell.CELL_TYPE_STRING).setCellValue(settle.getString("settle_date"));
             }
             row = sheet.createRow(++rowNum);
             for (int i = 0; i < analysis.length; i++) {

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

@@ -1099,12 +1099,16 @@
             r.client_refund_id,
             o.order_detail,
             o.dev_id,
-            a.rate
+            a.rate,
+            c.company_name,
+            c.short_name,
+            date_format(t.clearing_time,'%Y-%m-%d') settle_date
         FROM
             pmt_transactions t
         LEFT JOIN pmt_orders o ON o.order_id = t.order_id
         LEFT JOIN pmt_refunds r ON r.refund_id = t.refund_id
         LEFT JOIN log_clearing_detail_analysis a ON a.clearing_detail_id = t.clearing_order
+        LEFT JOIN sys_clients c ON c.client_id = t.client_id
         AND t.channel = a.channel
         WHERE t.channel != 'Settlement'
         ]]>

src/main/ui/static/templates/cbpay/css/gateway.css

@@ -29,7 +29,7 @@
 }
 
 .order-box{
-    height: 550px;
+    height: 580px;
     width: 800px;
     margin: 2% auto;
     /*box-shadow: 0px 0px 25px 0px rgba(0,0,0,0.21);*/

src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi.js

@@ -7,8 +7,12 @@ var num = function(obj){
 
     var surchargeData = calculateSurcharge(obj.value-0);
     var surchargeAmount = Decimal.add(surchargeData.surcharge,surchargeData.tax);
-    $('#surchargeAmount').html(surchargeAmount+'');
-    $('#totalAmount').html(surchargeData.newPrice+'');
+    var currency = '$';
+    if($('#select_currency').val()=='CNY'){
+        currency = '￥';
+    }
+    $('#surchargeAmount').html(currency+surchargeAmount+'');
+    $('#totalAmount').html(currency+surchargeData.newPrice+'');
     if(surchargeAmount+0===0 || !window.c4surcharge){
         $('.surcharge').hide();
     }else {

src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi_phone.js

@@ -10,8 +10,12 @@ var num = function (obj) {
 
     var surchargeData = calculateSurcharge(obj.value - 0);
     var surchargeAmount = Decimal.add(surchargeData.surcharge, surchargeData.tax);
-    $('#surchargeAmount').html(surchargeAmount + '');
-    $('#totalAmount').html(surchargeData.newPrice + '');
+    var currency = '$';
+    if($('#select_currency').val()=='CNY'){
+        currency = '￥';
+    }
+    $('#surchargeAmount').html(currency+surchargeAmount+'');
+    $('#totalAmount').html(currency+surchargeData.newPrice+'');
     if (surchargeAmount - 0 === 0 || !window.c4surcharge) {
         $('.surcharge').hide();
     } else {

src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi.js

@@ -7,8 +7,12 @@ var num = function(obj){
 
     var surchargeData = calculateSurcharge(obj.value-0);
     var surchargeAmount = Decimal.add(surchargeData.surcharge,surchargeData.tax);
-    $('#surchargeAmount').html(surchargeAmount+'');
-    $('#totalAmount').html(surchargeData.newPrice+'');
+    var currency = '$';
+    if($('#select_currency').val()=='CNY'){
+        currency = '￥';
+    }
+    $('#surchargeAmount').html(currency+surchargeAmount+'');
+    $('#totalAmount').html(currency+surchargeData.newPrice+'');
     if(surchargeAmount+0==0 || !window.c4surcharge){
         $('.surcharge').hide();
     }else {

src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi_phone.js

@@ -10,8 +10,12 @@ var num = function (obj) {
 
     var surchargeData = calculateSurcharge(obj.value - 0);
     var surchargeAmount = Decimal.add(surchargeData.surcharge, surchargeData.tax);
-    $('#surchargeAmount').html(surchargeAmount + '');
-    $('#totalAmount').html(surchargeData.newPrice + '');
+    var currency = '$';
+    if($('#select_currency').val()=='CNY'){
+        currency = '￥';
+    }
+    $('#surchargeAmount').html(currency+surchargeAmount+'');
+    $('#totalAmount').html(currency+surchargeData.newPrice+'');
     if (surchargeAmount - 0 == 0 || !window.c4surcharge) {
         $('.surcharge').hide();
     } else {