BD提成明细新增Royapay手续费字段

master
yangkai 6 years ago
parent bbf2aa3519
commit df8fd8de14

@ -655,7 +655,7 @@ public class BDPrizeServiceImpl implements BDPrizeService {
int rowNum = 0; int rowNum = 0;
Row row = sheet.createRow(rowNum); Row row = sheet.createRow(rowNum);
String[] title = {"Client Moniker", "Order Date Range", "Client Rate", "Client Source", "Init Months", "Transaction", "Coefficient", "BD Rate", String[] title = {"Client Moniker", "Order Date Range", "Client Rate", "Client Source", "Init Months", "Transaction", "Coefficient", "BD Rate",
"Commission", "Channel"}; "Commission", "RoyalPay Surcharge", "Channel"};
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]);
} }
@ -673,7 +673,8 @@ public class BDPrizeServiceImpl implements BDPrizeService {
row.createCell(6, Cell.CELL_TYPE_STRING).setCellValue(bdlog.getString("coefficient")); row.createCell(6, Cell.CELL_TYPE_STRING).setCellValue(bdlog.getString("coefficient"));
row.createCell(7, Cell.CELL_TYPE_STRING).setCellValue(bdlog.getString("bd_rate") + "%"); row.createCell(7, Cell.CELL_TYPE_STRING).setCellValue(bdlog.getString("bd_rate") + "%");
row.createCell(8, Cell.CELL_TYPE_STRING).setCellValue(bdlog.getString("prize_value")); row.createCell(8, Cell.CELL_TYPE_STRING).setCellValue(bdlog.getString("prize_value"));
row.createCell(9, Cell.CELL_TYPE_STRING).setCellValue(bdlog.getString("channel")); row.createCell(9, Cell.CELL_TYPE_STRING).setCellValue(bdlog.getString("royal_surcharge"));
row.createCell(10, Cell.CELL_TYPE_STRING).setCellValue(bdlog.getString("channel"));
} }
wb.write(ous); wb.write(ous);
ous.flush(); ous.flush();

@ -27,6 +27,7 @@
d.total_transaction, d.total_transaction,
d.prize_value, d.prize_value,
d.coefficient, d.coefficient,
d.royal_surcharge,
d.channel d.channel
FROM FROM
financial_bd_prize_detail d financial_bd_prize_detail d

@ -161,6 +161,7 @@
<th>Coefficient</th> <th>Coefficient</th>
<th>BD Rate</th> <th>BD Rate</th>
<th>Commission</th> <th>Commission</th>
<th>RoyalPay Surcharge</th>
<th>Fund</th> <th>Fund</th>
<th>Channel</th> <th>Channel</th>
</tr> </tr>
@ -179,6 +180,7 @@
<td ng-bind="log.coefficient"></td> <td ng-bind="log.coefficient"></td>
<td ng-bind="log.bd_rate+'%'"></td> <td ng-bind="log.bd_rate+'%'"></td>
<td ng-bind="log.prize_value|currency:'AUD '"></td> <td ng-bind="log.prize_value|currency:'AUD '"></td>
<td ng-bind="log.royal_surcharge|currency:'AUD '"></td>
<td ng-bind="log.donation|currency:'AUD '"></td> <td ng-bind="log.donation|currency:'AUD '"></td>
<td> <td>
<img ng-if="log.channel=='Alipay'" uib-tooltip="Alipay" src="/static/images/alipay_sign_lg.png"> <img ng-if="log.channel=='Alipay'" uib-tooltip="Alipay" src="/static/images/alipay_sign_lg.png">

Loading…
Cancel
Save