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

upd:修改invoice模版显示信息

Browse Source
master
dulingling 5 years ago
parent e7694fb38e
commit 39c9d1fefd
3 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>2.3.22</version> <version>2.3.23</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.3.0</jib-maven-plugin.version> <jib-maven-plugin.version>2.3.0</jib-maven-plugin.version>

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

@ -779,6 +779,7 @@ public class TradeLogServiceImpl implements TradeLogService {
) { ) {
List<JSONObject> dataList = transFlow.getJSONArray("data").toJavaList(JSONObject.class); List<JSONObject> dataList = transFlow.getJSONArray("data").toJavaList(JSONObject.class);
JSONObject parmerters = new JSONObject(); JSONObject parmerters = new JSONObject();
parmerters.put("records",dataList.size());
parmerters.put("dateFrom", StringUtils.isNotBlank(query.getDatefrom()) parmerters.put("dateFrom", StringUtils.isNotBlank(query.getDatefrom())
? DateFormatUtils.format(DateUtils.parseDate(query.getDatefrom(), "yyyyMMdd"), "dd/MM/yyyy") : ""); ? DateFormatUtils.format(DateUtils.parseDate(query.getDatefrom(), "yyyyMMdd"), "dd/MM/yyyy") : "");
parmerters.put("dateTo", parmerters.put("dateTo",

53
src/main/resources/templates/app/invoice.html
Unescape View File

@ -25,7 +25,7 @@
} }
.divcontent_left { .divcontent_left {
width: 50%; width: 48%;
height: auto; height: auto;
text-align: left; text-align: left;
float: left; float: left;
@ -35,7 +35,18 @@
} }
.divcontent_right { .divcontent_right {
width: 50%; width: 52%;
height: auto;
float: right;
text-align: left;
white-space: normal;
word-break: break-all;
word-wrap: break-word;
}
.divfoot_right {
line-height: 30px;
width: 60%;
height: auto; height: auto;
float: right; float: right;
text-align: left; text-align: left;
@ -105,6 +116,14 @@
} }
.spanfoot-title{
width: 55%;
float: left;
color: #000000;
font-size: 17px;
vertical-align: center;
}
.spancontent-value { .spancontent-value {
color: #000000; color: #000000;
font-size: 17px; font-size: 17px;
@ -114,6 +133,14 @@
} }
.spanfoot-value {
color: #000000;
font-size: 17px;
padding-left: 5px;
vertical-align: center;
}
.statement_title { .statement_title {
padding-bottom: 2%; padding-bottom: 2%;
padding-top: 2%; padding-top: 2%;
@ -123,8 +150,8 @@
</style> </style>
</head> </head>
<body> <body>
<!-- 商户信息 -->
<div class="divcontent"> <div class="divcontent">
<div class="divcontent_left"> <div class="divcontent_left">
<img src="https://mpay.royalpay.com.au/static/images/rp_logo.png" alt="" height="100px"/> <img src="https://mpay.royalpay.com.au/static/images/rp_logo.png" alt="" height="100px"/>
<img th:if="${orgInfo.logo!='none'}" th:src="${orgInfo.logo}" width="100px" height="100px" style="padding-left: 10px"/> <img th:if="${orgInfo.logo!='none'}" th:src="${orgInfo.logo}" width="100px" height="100px" style="padding-left: 10px"/>
@ -159,6 +186,7 @@
<div class="statement_title"> <div class="statement_title">
<span class="spantitle">Your Statement</span><br/> <span class="spantitle">Your Statement</span><br/>
</div> </div>
<!-- 列表标题 -->
<div class="divinvoicesTitle"> <div class="divinvoicesTitle">
<div class="divinvoiceItem" style="width: 16%"> <div class="divinvoiceItem" style="width: 16%">
<span>Date/Time</span> <span>Date/Time</span>
@ -187,6 +215,7 @@
<span>Settlement Amount</span> <span>Settlement Amount</span>
</div> </div>
</div> </div>
<!-- 列表循环 -->
<div th:each="invoicedata:${dataList}"> <div th:each="invoicedata:${dataList}">
<div class="divinvoicesContent"> <div class="divinvoicesContent">
<div class="divinvoiceItem" style="width: 16%"> <div class="divinvoiceItem" style="width: 16%">
@ -215,6 +244,24 @@
<span th:text="${invoicedata.settle_amount}?:'-'"></span> <span th:text="${invoicedata.settle_amount}?:'-'"></span>
</div> </div>
</div> </div>
</div>
<!-- 汇总数据-->
<div style="margin-top: 10px">
<span th:text="${parmerters.records}"></span>&nbsp;&nbsp;&nbsp;&nbsp;records.
</div>
<div class="divfoot_right">
<div>
<span class="spanfoot-title">Total Settlement Amount:</span>
<span class="spanfoot-value" th:text="${parmerters.totalSettledAmount}"></span>
</div>
<div>
<span class="spanfoot-title">Service Fee for RoyalPay:</span>
<span class="spanfoot-value" th:text="${parmerters.royalpay_gst}"></span>(GST inclu)
</div>
<div>
<span class="spanfoot-title">Service fee for Mini Program:</span>
<span class="spanfoot-value" th:text="${parmerters.incremental_gst}"></span>(GST inclu)
</div>
</div> </div>
</body> </body>

Write Preview
Loading…
Cancel
Save