diff --git a/pom.xml b/pom.xml index 9752a9b79..08118d1cf 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.1.2 - 1.0.3 + 1.0.4 diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java index e3ed48746..a7bbdcd00 100644 --- a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java @@ -655,7 +655,7 @@ public class BDPrizeServiceImpl implements BDPrizeService { int rowNum = 0; Row row = sheet.createRow(rowNum); 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++) { 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(7, Cell.CELL_TYPE_STRING).setCellValue(bdlog.getString("bd_rate") + "%"); 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); ous.flush(); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeDetailMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeDetailMapper.xml index d893e867e..d3e9d787c 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeDetailMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeDetailMapper.xml @@ -27,6 +27,7 @@ d.total_transaction, d.prize_value, d.coefficient, + d.royal_surcharge, d.channel FROM financial_bd_prize_detail d diff --git a/src/main/resources/templates/mail/new_client_notice.html b/src/main/resources/templates/mail/new_client_notice.html index e9db69583..3e2aaa514 100644 --- a/src/main/resources/templates/mail/new_client_notice.html +++ b/src/main/resources/templates/mail/new_client_notice.html @@ -9,22 +9,6 @@

Please kindly log on the website below to manage your accounts and transactions:
请登录这个网站查询管理所有交易

- - - - - - - - - - - - - - - -
Manager Account @@ -102,25 +86,6 @@
)
- - - - - - - - - - - - - - - - - - -

You can search " - - - - - - - - - - - - -

Best Regards

@@ -225,27 +177,6 @@
- - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html index 5c49583b6..7d11eb3cc 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html +++ b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html @@ -161,6 +161,7 @@ Coefficient BD Rate Commission + RoyalPay Surcharge Fund Channel @@ -179,6 +180,7 @@ + diff --git a/src/main/ui/static/images/App_banner.png b/src/main/ui/static/images/App_banner.png index 3411c20ac..696a6134e 100644 Binary files a/src/main/ui/static/images/App_banner.png and b/src/main/ui/static/images/App_banner.png differ diff --git a/src/main/ui/static/images/logo_light.png b/src/main/ui/static/images/logo_light.png index 846243988..8801a3fbd 100644 Binary files a/src/main/ui/static/images/logo_light.png and b/src/main/ui/static/images/logo_light.png differ