msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【R】商户端&运营端订单source处理 fix

Browse Source
master
liuxinxin 5 years ago
parent 0f35761f6b
commit caeae03bbf
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
Unescape View File

@ -827,7 +827,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
int rowNum = 0; int rowNum = 0;
Row row = sheet.createRow(rowNum); Row row = sheet.createRow(rowNum);
String[] title = {"order Id", "Client Order Id", "Transaction Time", "Channel", "Gateway", "Exchange Rate", "Transaction Type", "Currency", 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","Incremental Surcharge"}; "Input Amount", "Total Amount", "Clearing Amount", "Sruchange Rate", "Settle Amount", "Remark", "Dev No"};
String[] analysis = {"Total Credit", "Total Debit", "Gross Amount", "Total Charge", "Net Amount"}; String[] analysis = {"Total Credit", "Total Debit", "Gross Amount", "Total Charge", "Net Amount"};
for (int i = 0; i < title.length; i++) { for (int i = 0; i < title.length; i++) {
row.createCell(i, Cell.CELL_TYPE_STRING).setCellValue(title[i]); row.createCell(i, Cell.CELL_TYPE_STRING).setCellValue(title[i]);
@ -870,7 +870,6 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
if (device != null) if (device != null)
clientDevId = device.getString("client_dev_id"); clientDevId = device.getString("client_dev_id");
row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(clientDevId); row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(clientDevId);
row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("incremental_surcharge_settle"));
} }
row = sheet.createRow(++rowNum); row = sheet.createRow(++rowNum);
for (int i = 0; i < analysis.length; i++) { for (int i = 0; i < analysis.length; i++) {

23
src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
Unescape View File

@ -795,15 +795,16 @@ public class TradeLogServiceImpl implements TradeLogService {
row.createCell(10, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clearing_amount")); row.createCell(10, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clearing_amount"));
row.createCell(11, Cell.CELL_TYPE_STRING).setCellValue(data.getString("settle_amount")); row.createCell(11, Cell.CELL_TYPE_STRING).setCellValue(data.getString("settle_amount"));
row.createCell(12, Cell.CELL_TYPE_STRING).setCellValue(data.getString("total_surcharge")); row.createCell(12, Cell.CELL_TYPE_STRING).setCellValue(data.getString("total_surcharge"));
row.createCell(13, Cell.CELL_TYPE_STRING).setCellValue(data.getString("tax_amount")); row.createCell(13, Cell.CELL_TYPE_STRING).setCellValue(StringUtils.defaultString(data.getString("incremental_surcharge"),"0.0000"));
row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clearing_time")); row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(data.getString("tax_amount"));
row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type").equals("clearing") ? "-" : data.getBigDecimal("exchange_rate").toString()); row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clearing_time"));
row.createCell(16, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type")); row.createCell(16, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type").equals("clearing") ? "-" : data.getBigDecimal("exchange_rate").toString());
row.createCell(17, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clear_status")); row.createCell(17, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type"));
row.createCell(18, Cell.CELL_TYPE_STRING).setCellValue(data.getString("gateway")); row.createCell(18, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clear_status"));
row.createCell(19, Cell.CELL_TYPE_STRING).setCellValue(data.getString("order_detail")); row.createCell(19, Cell.CELL_TYPE_STRING).setCellValue(data.getString("gateway"));
row.createCell(20, Cell.CELL_TYPE_STRING).setCellValue(data.getString("dev_id")); row.createCell(20, Cell.CELL_TYPE_STRING).setCellValue(data.getString("order_detail"));
row.createCell(21, Cell.CELL_TYPE_STRING).setCellValue(StringUtils.defaultString(data.getString("incremental_surcharge"),"0.0000")); row.createCell(21, Cell.CELL_TYPE_STRING).setCellValue(data.getString("dev_id"));
} }
@Override @Override
@ -1452,8 +1453,8 @@ public class TradeLogServiceImpl implements TradeLogService {
Row row = sheet.createRow(rowNum); Row row = sheet.createRow(rowNum);
String[] title = {"Transaction Time", "Client Order ID", "System Order ID", "Client Moniker", "Short Name", String[] title = {"Transaction Time", "Client Order ID", "System Order ID", "Client Moniker", "Short Name",
"Order ID", "Channel", "Input Amount", "Transaction Amount", "Transaction Currency", "Clearing Amount", "Order ID", "Channel", "Input Amount", "Transaction Amount", "Transaction Currency", "Clearing Amount",
"Settle Amount", "Surcharge", "GST", "Settle Date", "Exchange Rate", "Settle Amount", "Surcharge", "Incremental Surcharge", "GST", "Settle Date", "Exchange Rate",
"Transaction Type", "Clearing Status", "Gateway", "Remark", "Dev No","Incremental Surcharge"}; "Transaction Type", "Clearing Status", "Gateway", "Remark", "Dev No"};
for (int j = 0; j < title.length; j++) { for (int j = 0; j < title.length; j++) {
row.createCell(j, Cell.CELL_TYPE_STRING).setCellValue(title[j]); row.createCell(j, Cell.CELL_TYPE_STRING).setCellValue(title[j]);
} }

6
src/main/ui/index.html
Unescape View File

@ -874,11 +874,11 @@ margin-bottom: 10%;"/>
<!--<i class="fa fa-list-alt"></i> -->Orders <!--<i class="fa fa-list-alt"></i> -->Orders
</a> </a>
</li> </li>
<li> <!--<li>
<a ui-sref="incremental_trade"> <a ui-sref="incremental_trade">
<!--<i class="fa fa-list-alt"></i> -->Incremental Orders &lt;!&ndash;<i class="fa fa-list-alt"></i> &ndash;&gt;Incremental Orders
</a> </a>
</li> </li>-->
<li> <li>
<a ui-sref="settlementlogs"> <a ui-sref="settlementlogs">
<!--<i class="fa fa-calendar"></i> -->Settlement <!--<i class="fa fa-calendar"></i> -->Settlement

1
src/main/ui/static/invoice/invoice_assistant.js
Unescape View File

@ -151,7 +151,6 @@ define(['angular','decimal'], function (angular,decimal) {
'<h5>手续费组成</h5>'+'<div style="background-color: #EFEFF5;height: 1px;margin-bottom: 10px;"></div>'+ '<h5>手续费组成</h5>'+'<div style="background-color: #EFEFF5;height: 1px;margin-bottom: 10px;"></div>'+
'<p>system:'+ system_surcharge +'</p>' + '<p>system:'+ system_surcharge +'</p>' +
'<p>'+channel+':'+ incremental_surcharge +'</p>'; '<p>'+channel+':'+ incremental_surcharge +'</p>';
debugger;
var a = royal_surcharge+incremental_surcharge+channel_surcharge+tax_amount; var a = royal_surcharge+incremental_surcharge+channel_surcharge+tax_amount;
if(total_surcharge <= (royal_surcharge+incremental_surcharge+channel_surcharge+tax_amount)){ if(total_surcharge <= (royal_surcharge+incremental_surcharge+channel_surcharge+tax_amount)){
tip = tip +'<p>tax amount:'+ tax_amount +'</p>'; tip = tip +'<p>tax amount:'+ tax_amount +'</p>';

Write Preview
Loading…
Cancel
Save