Merge branch 'develop'

# Conflicts:
#	pom.xml
master
taylor.dang 6 years ago
commit d2b86186fb

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>au.com.royalpay.payment</groupId> <groupId>au.com.royalpay.payment</groupId>
<artifactId>payment-parent</artifactId> <artifactId>payment-parent</artifactId>
<version>0.2.0</version> <version>0.2.0-dev</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.1.2</jib-maven-plugin.version> <jib-maven-plugin.version>1.1.2</jib-maven-plugin.version>
<docker-image.version>1.0.3</docker-image.version> <docker-image.version>1.0.4</docker-image.version>
</properties> </properties>
<dependencies> <dependencies>

@ -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

@ -1,110 +1,182 @@
<html xmlns:th="http://www.thymeleaf.org" lang="zh"> <html xmlns:th="http://www.thymeleaf.org" lang="zh">
<h4>Dear <span th:text="${short_name}"></span> :</h4> <div style="margin-left: 1rem;margin-right: 1rem;margin-top: 2rem;margin-bottom: 2rem">
<p>I'm happy to let you know that your RoyalPay Cross-border Payment account has been set up.<br> <h4 style="font-family: Avenir-Heavy;font-size: 2rem;color: #000000;letter-spacing: 0;">Dear <span
很高兴通知您贵司RoyalPay跨境全支付已经开通</p> th:text="${short_name}"></span> :</h4>
<p style="font-family: Avenir-Light;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;">I'm happy to let you know
<p>Please kindly log on the website below to manage your accounts and transactions:<br> that your RoyalPay Cross-border Payment account has been set up.<br>
请登录这个网站查询管理所有交易</p> 很高兴通知您贵司RoyalPay跨境全支付已经开通</p>
<table style="border: 1px solid #333;width: 100%">
<tbody> <p style="font-family: Avenir-Light;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;">Please kindly log on the
<tr> website below to manage your accounts and transactions:<br>
<td colspan="3" align="center"> 请登录这个网站查询管理所有交易</p>
Log on website:<a href="https://mpay.royalpay.com.au">https://mpay.royalpay.com.au/</a> <div style="background-image: linear-gradient(-177deg, #FFF7ED 0%, #FFECD7 100%);width: 100%;">
</td> <div style="display: flex;justify-content: center;font-family: Avenir-Light;font-size: 2rem;color: #FF6600;letter-spacing: 0;padding: 1rem">
</tr> Manager Account
<tr> </div>
<th></th> <div style="display: flex;justify-content: space-around;padding: 1rem">
<th>Account Name</th> <div>
<th>p/w</th> <div style="display: inline;font-family: Avenir-Heavy;font-size: 1rem;color: #9A948F;letter-spacing: 0;">
</tr> Account Name:
<tr> </div>
<th>Manager Account</th> <div th:text="${username}"
<td align="center" th:text="${username}"></td> style="display: inline; font-family: Avenir-Heavy;font-size: 1rem;color: #000000;letter-spacing: 0;">
<td align="center" th:text="${password}"></td> </div>
</tr> <div style="margin-bottom: 2rem;margin-top: 2rem;">
</tbody> <div style="display: inline;font-family: Avenir-Heavy;font-size: 1rem;color: #9A948F;letter-spacing: 0;">
</table> Log on website:
<ul> </div>
<li>The password can be changed any time when you login. 您登陆后可以任意修改密码</li> <div style="display: inline"><a href="https://mpay.royalpay.com.au"
<li>It's recommended to change your password as soon as first login. 建议首次登陆后就修改您的密码</li> style="color: #FF700F;font-family: Avenir-Light;font-size: 1rem;letter-spacing: 0;">https://mpay.royalpay.com.au/</a>
<li>You can set up different accounts for the staff. (At the category:"Accounts") </div>
您可以为您的员工配置其他账号在Accounts菜单内 </div>
</li> </div>
</ul> <div>
<p>Please find the User Guide here :<a <div style="display: inline;font-family: Avenir-Heavy;font-size: 1rem;color: #9A948F;letter-spacing: 0;">
href="https://www.royalpay.com.au/downloads/royalpay_user_guide.pdf" target="_blank">User p/w:
Guide for PC</a> or </div>
<a <div th:text="${password}"
href="https://help.royalpay.com.au/iphone/app_manual_v1.pdf" target="_blank">User style="display: inline; font-family: Avenir-Heavy;font-size: 1rem;color: #000000;letter-spacing: 0;">
Guide for APP</a> </div>
</p> </div>
<p>您可以点击链接下载用户手册:<a href="https://www.royalpay.com.au/downloads/royalpay_user_guide.pdf" </div>
target="_blank">PC用户手册</a> </div>
<a href="https://help.royalpay.com.au/iphone/app_manual_v1.pdf" <div style="font-family: Avenir-Heavy;font-size: 2rem;color: #000000;letter-spacing: 0; margin-top: 1rem;">
target="_blank">APP用户手册</a> attention
</p> </div>
<ul style="font-family: Avenir-Light;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;">
<p>(If you cannot open the link above, you can copy and paste this url to your browser. <li>The password can be changed any time when you login. 您登陆后可以任意修改密码</li>
如果您无法点击上面的链接可以复制当前url到浏览器地址栏 <li>It's recommended to change your password as soon as first login. 建议首次登陆后就修改您的密码</li>
<b>https://www.royalpay.com.au/downloads/royalpay_user_guide.pdf</b>)</p> <li>You can set up different accounts for the staff. (At the category:"Accounts")
<hr> 您可以为您的员工配置其他账号在Accounts菜单内
<p>You can search "<a </li>
href="https://itunes.apple.com/app/royalpay/id1049566852?l=en&mt=8">RoyalPay</a>" in APP </ul>
Store to download APP for IOSwhich helps check your payment receiving records.</p>
<p>您可以在APP Store里搜索"RoyalPay"下载royalpay的app来进行收款和接收到账提醒等。</p> <div style="margin-top: 1rem">
<p><img src="https://mpay.royalpay.com.au/static/images/app_guide.png"> <br></p> <div style="display: inline">Please find the User Guide here :</div>
<hr> <div style="display: inline;font-family: Avenir-Light;font-size: 1rem;color: #FF6600;letter-spacing: 0;text-decoration: underline">
<p>Online RoyalPay Cross-border Payment is also available! The development of the document (API) is <a style="color: #FF6600" href="https://www.royalpay.com.au/downloads/royalpay_user_guide.pdf"
here.</p> target="_blank">User
<p>如需接入网站支付系统可将下方API链接及授权信息发给IT团队</p> Guide for PC</a>
<p style="background: #e0e0e0"> </div>
Chinse version:<br> <div style="display: inline">or</div>
<a href="https://mpay.royalpay.com.au/docs/cn/">https://mpay.royalpay.com.au/docs/cn/</a><br><br> <div style="display: inline;font-family: Avenir-Light;font-size: 1rem;color: #FF6600;letter-spacing: 0;text-decoration: underline">
<a style="color: #FF6600;" href="https://help.royalpay.com.au/iphone/app_manual_v1.pdf" target="_blank">User
English version:<br> Guide for APP</a>
<a href="https://mpay.royalpay.com.au/docs/en/">https://mpay.royalpay.com.au/docs/en/</a><br><br> </div>
</div>
<span th:text="'Partner Code:'+${client_moniker}"></span><br> <div style="margin-top: 1rem">
<span th:text="'Credential Code:'+${credential_code}"></span> <div style="display: inline">您可以点击链接下载用户手册 :</div>
</p> <div style="display: inline;font-family: Avenir-Light;font-size: 1rem;color: #FF6600;letter-spacing: 0;text-decoration: underline
"><a style="color: #FF6600" href="https://www.royalpay.com.au/downloads/royalpay_user_guide.pdf"
target="_blank">PC用户手册</a>
<p> </div>
Please contact us via any way displaying below if you have any questions. Thank you for choosing <div style="display: inline"></div>
RoyalPay.<br> <div style="display: inline;font-family: Avenir-Light;font-size: 1rem;color: #FF6600;letter-spacing: 0;text-decoration: underline
十分感谢您对RoyalPay皇家支付的信任和支持。如果您有任何问题随时可以按以下方式与我们联系。谢谢 "><a style="color: #FF6600" href="https://help.royalpay.com.au/iphone/app_manual_v1.pdf"
</p> target="_blank">APP用户手册</a>
<div style="background: #d0d0d0" th:if="${#lists.size(bds)>0}"> </div>
<h4> </div>
Your dedicated account manager<br> <div style="margin-top: 1rem;margin-bottom: 1rem;font-family: Avenir-Light;font-size: 1rem;color: #4A4A4A;letter-spacing: 0;">
您的专属客户经理 <div style="display: inline;font-family: Avenir-Light;font-size: 1rem;color: #4A4A4A;letter-spacing: 0;">(If
</h4> you
<p th:each="bd : ${bds}"> cannot open the link above, you can copy and paste this url to your
<span th:text="${bd.display_name}"></span><br> browser.如果您无法点击上面的链接可以复制当前url到浏览器地址栏
Email:<a href="mailto:$bd.email" th:utext="${bd.email}"></a><br> </div>
<span th:text="${bd.phone}"></span><br> <div style="display: inline"><b style="color: #FF6600;">https://www.royalpay.com.au/downloads/royalpay_user_guide.pdf</b>
<span th:if="${bd['wechat']!=null} and ${bd['wechat']!=''}" th:text="${bd.wechat}"></span> </div>
<div style="display: inline">)</div>
</div>
<div style="width: 100%;height: 0.1rem;background: #F9E6D8;margin-top: 2rem;margin-bottom: 2rem;"></div>
<p style="font-family: Avenir-Light;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;">You can search "<a
style="color: #FF6600;text-decoration: none"
href="https://itunes.apple.com/app/royalpay/id1049566852?l=en&mt=8">RoyalPay</a>" in APP
Store to download APP for IOSwhich helps check your payment receiving records.</p>
<p style="font-family: PingFang-SC-Medium;font-size: 1rem;color: #000000;letter-spacing: 0;">
您可以在APP Store里搜索"<a style="color: #FF6600;text-decoration: none"
href="https://itunes.apple.com/app/royalpay/id1049566852?l=en&mt=8">RoyalPay</a>"下载royalpay的app来进行收款和接收到账提醒等。
</p> </p>
<p><img style="width: 100%" src="https://mpay.royalpay.com.au/static/images/App_banner.png"> <br>
</p>
<div style="width: 100%;height: 0.1rem;background: #F9E6D8;margin-top: 2rem;margin-bottom: 2rem;"></div>
<p style="font-family: Avenir-Light;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;">Online RoyalPay
Cross-border
Payment is also available! The development of the document (API) is
here.</p>
<p style="font-family: Avenir-Light;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;">
如需接入网站支付系统可将下方API链接及授权信息发给IT团队</p>
<div style="background: #F4F4F4;width: 100%;">
<div style="font-family: Avenir-Heavy;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;padding-left: 2rem;padding-top: 2rem">
Chinse version:
</div>
<div style="font-family: Avenir-Light;font-size: 1rem;color: #002A00;letter-spacing: 0;padding-left: 2rem;">
<a style="color: #FF6600"
href="https://mpay.royalpay.com.au/docs/cn/">https://mpay.royalpay.com.au/docs/cn/</a>
</div>
<div style="font-family: Avenir-Heavy;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;padding-left: 2rem;padding-top: 2rem">
English version:
</div>
<div style="font-family: Avenir-Light;font-size: 1rem;color: #002A00;letter-spacing: 0;padding-left: 2rem;">
<a style="color: #FF6600"
href="https://mpay.royalpay.com.au/docs/en/">https://mpay.royalpay.com.au/docs/en/</a>
</div>
<div style="font-family: Avenir-Heavy;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;padding-left: 2rem;padding-top: 2rem">
<span th:text="'Partner Code:'+${client_moniker}"></span>
</div>
<div style="font-family: Avenir-Heavy;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;padding-left: 2rem;padding-bottom: 2rem">
<span th:text="'Credential Code:'+${credential_code}"></span>
</div>
</div>
<div style="font-family: Avenir-Light;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;margin-top: 1rem;margin-bottom: 1rem">
Please
contact us via any
way displaying below if you have any questions. Thank you for choosing
RoyalPay.
</div>
<div style="font-family: Avenir-Light;font-size: 1rem;color: #2A2A2A;letter-spacing: 0;margin-top: 1rem;margin-bottom: 1rem">
十分感谢您对RoyalPay皇家支付的信任和支持。如果您有任何问题随时可以按以下方式与我们联系。谢谢
</div>
<div style="width: 100%;height: 0.2rem;background: #FF6600;margin-top: 2rem;margin-bottom: 2rem;"></div>
<h4 style="font-family: Avenir-Heavy;font-size: 2rem;color: #000000;letter-spacing: 0;">Best Regards</h4>
<div style="display: flex;justify-content: center;">
<img style="width: 7.5rem;height: 7.5rem"
src="https://mpay.royalpay.com.au/static/images/logo_light.jpg">
</div>
<div style="display: flex;justify-content: space-around">
<div style="font-family: Avenir-Medium;font-size: 1rem;color: #888888;">
<div style="">Email:<br/><a style="color: #888888;text-decoration: none" href="mailto:info@royalpay.com.au">info@royalpay.com.au</a></div>
<div style="margin-top: 1rem;">Tel:<br/>1300 10 77 50</div>
<div style="margin-top: 1rem;">Level 14, 383 Kent Street, Sydney NSW 2000</div>
<div style="margin-top: 1rem;">Tunnel Show Pty Ltd trading as RoyalPay</div>
</div>
<div style="font-family: Avenir-Medium;font-size: 1rem;color: #888888;">
<div>
<div style="display: inline;">Service WeChat Account:</div>
<br/>
<img src="https://mpay.royalpay.com.au/static/images/customer_service.jpg"
style="width: 3rem;height: 3rem">
</div>
<div style="margin-top: 2rem;">Level 11, 15 William Street, Melbourne VIC 3000</div>
<div style="margin-top: 1rem;">Representative of AFSL licensee 448066</div>
</div>
</div>
<div style="width: 100%;height: 0.1rem;background: #F9E6D8;margin-top: 2rem;margin-bottom: 2rem;"></div>
</div> </div>
<hr>
<h4>Best Regards</h4>
<p>
<img style="width: 120px;height: 120px"
src="https://mpay.royalpay.com.au/static/images/logo_new.jpg"> <br>
Contact Us<br>
Email:<br>
<a href="mailto:info@royalpay.com.au">info@royalpay.com.au</a> <br>
Tel:<br>
1300 10 77 50<br>
<br>
Service WeChat Account:<br>
<img src="https://mpay.royalpay.com.au/static/images/customer_service.jpg"
style="width: 60px"><br>
Level 14, 383 Kent Street, Sydney NSW 2000<br>
<br>
Level 11, 15 William Street, Melbourne VIC 3000
</p>
<p>Tunnel Show Pty Ltd trading as RoyalPay<br>
Representative of AFSL licensee 448066
</p>
</html> </html>

@ -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">

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Loading…
Cancel
Save