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

invoice支持html转pdf

Browse Source
master
taylor.dang 5 years ago
parent c89893d3fb
commit ef2bf3659b
8 changed files with 372 additions and 160 deletions
Show Stats Download Patch File Download Diff File

4
pom.xml
Unescape View File

@ -9,10 +9,10 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>2.3.9</version> <version>2.3.10</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.2.0</jib-maven-plugin.version> <jib-maven-plugin.version>2.3.0</jib-maven-plugin.version>
<docker-image.version>${project.version}</docker-image.version> <docker-image.version>${project.version}</docker-image.version>
</properties> </properties>

21
src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
Unescape View File

@ -26,6 +26,7 @@ import au.com.royalpay.payment.manage.merchants.core.ClientManager;
import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
import au.com.royalpay.payment.manage.pos.datasource.ReadOnlyConnection; import au.com.royalpay.payment.manage.pos.datasource.ReadOnlyConnection;
import au.com.royalpay.payment.manage.system.core.TradeSecureService; import au.com.royalpay.payment.manage.system.core.TradeSecureService;
import au.com.royalpay.payment.manage.tradelog.beans.TradeLogQuery;
import au.com.royalpay.payment.manage.tradelog.core.TradeLogService; import au.com.royalpay.payment.manage.tradelog.core.TradeLogService;
import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.CommonConsts;
import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi; import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
@ -52,6 +53,7 @@ import org.joda.time.DateTime;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.ui.Model;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.MimeTypeUtils; import org.springframework.util.MimeTypeUtils;
import org.springframework.validation.Errors; import org.springframework.validation.Errors;
@ -394,6 +396,7 @@ public class TestController {
public void aliforexcel(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, HttpServletResponse httpResponse, AliExcel query) throws Exception { public void aliforexcel(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, HttpServletResponse httpResponse, AliExcel query) throws Exception {
aliforexcelService.listClients(httpResponse, manager, query); aliforexcelService.listClients(httpResponse, manager, query);
} }
@ManagerMapping(value = "/partner/reset_password", method = RequestMethod.GET, role = ManagerRole.DEVELOPER) @ManagerMapping(value = "/partner/reset_password", method = RequestMethod.GET, role = ManagerRole.DEVELOPER)
public void resetPartnerPassword() { public void resetPartnerPassword() {
clientManager.updateAllPartnerPassword("PINE"); clientManager.updateAllPartnerPassword("PINE");
@ -548,4 +551,22 @@ public class TestController {
model.addObject("client", result); model.addObject("client", result);
return model; return model;
} }
@GetMapping(value = "/trans_flow/pdf")
@ReadOnlyConnection
public ModelAndView exportTransFlowPDFHtml(TradeLogQuery query, @RequestParam String client_moniker, Model model) throws Exception {
return tradeLogService.exportTransFlow(query, getPartnerParams(client_moniker), model);
}
private JSONObject getPartnerParams(String clientMoniker) {
JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker);
if (client == null) {
throw new NotFoundException("Client Not Exists");
}
JSONObject params = new JSONObject();
params.put("client_id", client.getIntValue("client_id"));
params.put("client", client);
params.put("client_moniker", clientMoniker);
return params;
}
} }

3
src/main/java/au/com/royalpay/payment/manage/pos/datasource/ReadOnlyConnectionInterceptor.java
Unescape View File

@ -19,8 +19,7 @@ public class ReadOnlyConnectionInterceptor implements Ordered {
public Object proceed(ProceedingJoinPoint proceedingJoinPoint, ReadOnlyConnection readOnlyConnection) throws Throwable { public Object proceed(ProceedingJoinPoint proceedingJoinPoint, ReadOnlyConnection readOnlyConnection) throws Throwable {
try { try {
DbContextHolder.setDbType(DbContextHolder.DbType.SLAVE); DbContextHolder.setDbType(DbContextHolder.DbType.SLAVE);
Object result = proceedingJoinPoint.proceed(); return proceedingJoinPoint.proceed();
return result;
} finally { } finally {
DbContextHolder.clearDbType(); DbContextHolder.clearDbType();
} }

3
src/main/java/au/com/royalpay/payment/manage/tradelog/core/TradeLogService.java
Unescape View File

@ -4,6 +4,7 @@ import au.com.royalpay.payment.manage.tradelog.beans.PreRefundQueryBean;
import au.com.royalpay.payment.manage.tradelog.beans.TradeLogQuery; import au.com.royalpay.payment.manage.tradelog.beans.TradeLogQuery;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
@ -36,6 +37,8 @@ public interface TradeLogService {
void exportTransFlow(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception; void exportTransFlow(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception;
ModelAndView exportTransFlow(TradeLogQuery query, JSONObject partner, Model model) throws Exception;
void exportUpayTransFlow(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception; void exportUpayTransFlow(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception;
void exportTransFlowApi(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception; void exportTransFlowApi(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception;

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

@ -52,7 +52,6 @@ import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.time.DateUtils;
import org.apache.http.util.TextUtils;
import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.*;
@ -62,9 +61,9 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.servlet.ModelAndView;
import org.thymeleaf.context.Context; import org.thymeleaf.context.Context;
import org.thymeleaf.spring5.SpringTemplateEngine; import org.thymeleaf.spring5.SpringTemplateEngine;
import org.xhtmlrenderer.pdf.ITextFontResolver;
import org.xhtmlrenderer.pdf.ITextRenderer; import org.xhtmlrenderer.pdf.ITextRenderer;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -523,9 +522,6 @@ public class TradeLogServiceImpl implements TradeLogService {
params.put("client_id", client_id); params.put("client_id", client_id);
JSONObject mchConfig = merchantInfoProvider.getMchExtParams(partner.getIntValue("client_id")); JSONObject mchConfig = merchantInfoProvider.getMchExtParams(partner.getIntValue("client_id"));
params.put("hide_sub_mch", mchConfig.getBooleanValue("hide_sub_mch")); params.put("hide_sub_mch", mchConfig.getBooleanValue("hide_sub_mch"));
// PageList<JSONObject> logs = transactionMapper.listTransFlowPage(params,
// new PageBounds(query.getPage(), query.getLimit(), Order.formString("transaction_time.desc")));
List<JSONObject> logs = transactionMapper.listTransFlow(params); List<JSONObject> logs = transactionMapper.listTransFlow(params);
TimeZoneUtils.switchTimeZone(logs, timezone, "create_time", "confirm_time", "transaction_time"); TimeZoneUtils.switchTimeZone(logs, timezone, "create_time", "confirm_time", "transaction_time");
Paginator paginator = new Paginator(query.getPage(), query.getLimit(), logs.size()); Paginator paginator = new Paginator(query.getPage(), query.getLimit(), logs.size());
@ -570,9 +566,11 @@ public class TradeLogServiceImpl implements TradeLogService {
int clientId = partner.getIntValue("client_id"); int clientId = partner.getIntValue("client_id");
String timezone = partner.getJSONObject("client").getString("timezone"); String timezone = partner.getJSONObject("client").getString("timezone");
JSONObject params = query.toParams(timezone); JSONObject params = query.toParams(timezone);
params.put("channel", channels); // params.put("channel", channels);
clientManager.validateClients(clientId, params); clientManager.validateClients(clientId, params);
params.put("client_id", clientId); params.put("client_id", clientId);
JSONObject mchConfig = merchantInfoProvider.getMchExtParams(partner.getIntValue("client_id"));
params.put("hide_sub_mch", mchConfig.getBooleanValue("hide_sub_mch"));
clientManager.queryModifyClientIds(clientId, params); clientManager.queryModifyClientIds(clientId, params);
List<JSONObject> logs = transactionMapper.listTransFlow(params); List<JSONObject> logs = transactionMapper.listTransFlow(params);
TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy HH:mm:ss", Collections.singletonList("transaction_time")); TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy HH:mm:ss", Collections.singletonList("transaction_time"));
@ -771,15 +769,14 @@ public class TradeLogServiceImpl implements TradeLogService {
// } // }
@Override @Override
public void exportTransFlow(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception { public void exportTransFlow(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception {
JSONObject transFlow = listPartnerTransFlowByExportPdf(query, partner,new String[]{"Wechat","Alipay","AlipayOnline"}); JSONObject transFlow = listPartnerTransFlowByExportPdf(query, partner, new String[]{"Wechat", "Alipay", "AlipayOnline"});
JSONObject analysis = transFlow.getJSONObject("analysis"); JSONObject analysis = transFlow.getJSONObject("analysis");
JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id")); JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id"));
Context ctx = new Context(); Context ctx = new Context();
// JSONObject manager = managerMapper.findById(device.getString("manager_id"));
// ctx.setVariable("firstname","lu");
if (!transFlow.getJSONArray("data").isEmpty()) { if (!transFlow.getJSONArray("data").isEmpty()) {
try { try (OutputStream outs = response.getOutputStream();
ByteArrayOutputStream os = new ByteArrayOutputStream();
) {
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("dateFrom", StringUtils.isNotBlank(query.getDatefrom()) parmerters.put("dateFrom", StringUtils.isNotBlank(query.getDatefrom())
@ -788,7 +785,7 @@ public class TradeLogServiceImpl implements TradeLogService {
StringUtils.isNotBlank(query.getDateto()) StringUtils.isNotBlank(query.getDateto())
? DateFormatUtils.format(DateUtils.parseDate(query.getDateto(), "yyyyMMdd"), "dd/MM/yyyy") ? DateFormatUtils.format(DateUtils.parseDate(query.getDateto(), "yyyyMMdd"), "dd/MM/yyyy")
: DateFormatUtils.format(new Date(), "dd/MM/yyyy")); : DateFormatUtils.format(new Date(), "dd/MM/yyyy"));
parmerters.put("dateRange", (StringUtils.isNotBlank(parmerters.getString("dateFrom")) ? parmerters.getString("dateFrom") : "") + "~" parmerters.put("dateRange", (StringUtils.isNotBlank(parmerters.getString("dateFrom")) ? parmerters.getString("dateFrom") : "") + " ~ "
+ parmerters.getString("dateTo")); + parmerters.getString("dateTo"));
parmerters.put("partnerCode", client.getString("client_moniker")); parmerters.put("partnerCode", client.getString("client_moniker"));
parmerters.put("clientName", client.getString("company_name")); parmerters.put("clientName", client.getString("company_name"));
@ -833,63 +830,116 @@ public class TradeLogServiceImpl implements TradeLogService {
: "-"; : "-";
item.put("debit", debit); item.put("debit", debit);
item.put("credit", credit); item.put("credit", credit);
if(item.get("settle_amount")==null){ item.putIfAbsent("settle_amount", "-");
item.put("settle_amount","-");
}
}); });
System.out.println("------>dataList:"+dataList); ctx.setVariable("parmerters", parmerters);
System.out.println("------>parmerters:"+parmerters); ctx.setVariable("dataList", dataList);
ctx.setVariable("parmerters",parmerters); JSONObject orgInfo = orgManager.getOrgDetail(client.getIntValue("org_id"), null);
ctx.setVariable("dataList",dataList); if (!orgInfo.containsKey("logo") || orgInfo.getIntValue("org_id") == 1) {
orgInfo.put("logo", "none");
}
ctx.setVariable("orgInfo", orgInfo);
final String html = thymeleaf.process("app/invoice.html", ctx); final String html = thymeleaf.process("app/invoice.html", ctx);
JRDataSource jrDataSource = new JRBeanCollectionDataSource(dataList);
response.setContentType("application/pdf"); response.setContentType("application/pdf");
String fileName = client.getString("client_moniker") + "_Cross_Border_" + parmerters.getString("dateRange").replaceAll("/", ""); String fileName = client.getString("client_moniker") + "_Cross_Border_" + parmerters.getString("dateRange").replaceAll("/", "");
response.setHeader("Content-Disposition", "attachment;fileName=" + fileName + ".pdf"); response.setHeader("Content-Disposition", "attachment;fileName=" + fileName + ".pdf");
OutputStream outs = response.getOutputStream();
// JSONObject clientIncrement = clientIncrementalMapper.findByClinetIdAndChannel(client.getIntValue("client_id"), "RP跨境商城");
// InputStream jasper = clientIncrement == null ? trans_flow.getInputStream() : incremental_trans_flow.getInputStream();
// byte[] bytes = JasperRunManager.runReportToPdf(jasper, parmerters, jrDataSource);
System.out.println("------>content:"+html);
ByteArrayOutputStream os = new ByteArrayOutputStream();
ITextRenderer renderer = new ITextRenderer(); ITextRenderer renderer = new ITextRenderer();
// ITextFontResolver fontResolver = (ITextFontResolver) renderer.getSharedContext().getFontResolver();
//添加字体库 begin
// File f = new File(fontDir);
// if (f.isDirectory()) {
// File[] files = f.listFiles(new FilenameFilter() {
// public boolean accept(File dir, String name) {
// String lower = name.toLowerCase();
// return lower.endsWith(".otf") || lower.endsWith(".ttf") ;
// }
// });
// for (int i = 0; i < files.length; i++) {
// fontResolver.addFont(files[i].getAbsolutePath(), BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
// }
// }
//添加字体库end //添加字体库end
renderer.setDocumentFromString(html); renderer.setDocumentFromString(html);
renderer.layout(); renderer.layout();
renderer.createPDF(os); renderer.createPDF(os);
renderer.finishPDF();
byte[] bytes = os.toByteArray(); byte[] bytes = os.toByteArray();
outs.write(bytes, 0, bytes.length); outs.write(bytes, 0, bytes.length);
outs.flush(); outs.flush();
outs.close(); renderer.finishPDF();
} catch (Exception e) {
e.printStackTrace();
}
}
}
@Override
public ModelAndView exportTransFlow(TradeLogQuery query, JSONObject partner, Model model) throws Exception {
JSONObject transFlow = listPartnerTransFlowByExportPdf(query, partner, new String[]{"Wechat", "Alipay", "AlipayOnline"});
JSONObject analysis = transFlow.getJSONObject("analysis");
JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id"));
ModelAndView view = new ModelAndView("app/invoice.html");
if (!transFlow.getJSONArray("data").isEmpty()) {
try {
List<JSONObject> dataList = transFlow.getJSONArray("data").toJavaList(JSONObject.class);
JSONObject parmerters = new JSONObject();
parmerters.put("dateFrom", StringUtils.isNotBlank(query.getDatefrom())
? DateFormatUtils.format(DateUtils.parseDate(query.getDatefrom(), "yyyyMMdd"), "dd/MM/yyyy") : "");
parmerters.put("dateTo",
StringUtils.isNotBlank(query.getDateto())
? DateFormatUtils.format(DateUtils.parseDate(query.getDateto(), "yyyyMMdd"), "dd/MM/yyyy")
: DateFormatUtils.format(new Date(), "dd/MM/yyyy"));
parmerters.put("dateRange", (StringUtils.isNotBlank(parmerters.getString("dateFrom")) ? parmerters.getString("dateFrom") : "") + " ~ "
+ parmerters.getString("dateTo"));
parmerters.put("partnerCode", client.getString("client_moniker"));
parmerters.put("clientName", client.getString("company_name"));
parmerters.put("clientAddress", client.getString("address"));
parmerters.put("balance", analysis.getDoubleValue("balance"));
parmerters.put("logo", logo.getInputStream());
parmerters.put("actual_fee", takeDecimalOrDefault(analysis, "actual_fee", BigDecimal.ZERO));
parmerters.put("totalSettledAmount", takeDecimalOrDefault(analysis, "total_settle_amount", BigDecimal.ZERO));
parmerters.put("royalpay_charge", takeDecimalOrDefault(analysis, "total_royal_surcharge", BigDecimal.ZERO));
parmerters.put("total_fee", takeDecimalOrDefault(analysis, "total_surcharge", BigDecimal.ZERO));
parmerters.put("alipay_fee", takeDecimalOrDefault(analysis, "alipay_fee", BigDecimal.ZERO));
parmerters.put("wechat_fee", takeDecimalOrDefault(analysis, "wechat_fee", BigDecimal.ZERO));
parmerters.put("alipay_online_fee", takeDecimalOrDefault(analysis, "alipay_online_fee", BigDecimal.ZERO));
parmerters.put("gst", takeDecimalOrDefault(analysis, "tax_amount", BigDecimal.ZERO));
parmerters.put("royalpay_fee", takeDecimalOrDefault(analysis, "total_royalpay_fee", BigDecimal.ZERO));
parmerters.put("incremental_fee", takeDecimalOrDefault(analysis, "total_incremental_surcharge", BigDecimal.ZERO));
parmerters.put("incremental_gst", takeDecimalOrDefault(analysis, "total_incremental_tax", BigDecimal.ZERO));
parmerters.put("royalpay_gst", analysis.getBigDecimal("tax_amount").subtract(analysis.getBigDecimal("total_incremental_tax")).setScale(2, RoundingMode.HALF_UP));
dataList.parallelStream().forEach(item -> {
BigDecimal incrementalSurcharge = item.containsKey("incremental_surcharge") ? item.getBigDecimal("incremental_surcharge") : BigDecimal.ZERO;
BigDecimal taxAmount = item.containsKey("tax_amount") ? item.getBigDecimal("tax_amount") : BigDecimal.ZERO;
BigDecimal royalpaySurhcarge = item.containsKey("royal_surcharge") ? item.getBigDecimal("royal_surcharge") : BigDecimal.ZERO;
BigDecimal surhcargeBack = item.containsKey("surcharge_cashback") ? item.getBigDecimal("surcharge_cashback") : BigDecimal.ZERO;
BigDecimal channelSurcharge = item.containsKey("channel_surcharge") ? item.getBigDecimal("channel_surcharge") : BigDecimal.ZERO;
BigDecimal incrementalTax = incrementalSurcharge.divide(new BigDecimal(10), 2, RoundingMode.HALF_UP);
BigDecimal royalpayTax = taxAmount.subtract(incrementalTax);
BigDecimal realRoyalpayCharge = royalpaySurhcarge
.add(surhcargeBack)
.add(channelSurcharge)
.add(royalpayTax);
item.put("incremental_surcharge", incrementalSurcharge.add(incrementalTax).setScale(2, RoundingMode.HALF_UP));
item.put("real_royalpay_surcharge", realRoyalpayCharge.setScale(2, RoundingMode.HALF_UP));
scaleDecimalVal(item, "display_amount", item.getString("currency"));
String platformCurrency = PlatformEnvironment.getEnv().getForeignCurrency();
scaleDecimalVal(item, "clearing_amount", platformCurrency);
scaleDecimalVal(item, "settle_amount", platformCurrency);
scaleDecimalVal(item, "total_surcharge", platformCurrency);
String debit = item.getString("transaction_type").equals("Debit") ? item.getBigDecimal("clearing_amount").toString()
: "-";
String credit = item.getString("transaction_type").equals("Credit") ? item.getBigDecimal("clearing_amount").toString()
: "-";
item.put("debit", debit);
item.put("credit", credit);
item.putIfAbsent("settle_amount", "-");
});
view.addObject("parmerters", parmerters);
view.addObject("dataList", dataList);
JSONObject orgInfo = orgManager.getOrgDetail(client.getIntValue("org_id"), null);
if (!orgInfo.containsKey("logo") || orgInfo.getIntValue("org_id") == 1) {
orgInfo.put("logo", "none");
}
view.addObject("orgInfo", orgInfo);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
return view;
} }
@Override @Override
public void exportUpayTransFlow(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception { public void exportUpayTransFlow(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws
JSONObject transFlow = listPartnerTransFlowByExportPdf(query, partner,new String[]{"rpaypmt_card","rpaypmt_dd"}); Exception {
JSONObject transFlow = listPartnerTransFlowByExportPdf(query, partner, new String[]{"rpaypmt_card", "rpaypmt_dd"});
JSONObject analysis = transFlow.getJSONObject("analysis"); JSONObject analysis = transFlow.getJSONObject("analysis");
JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id")); JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id"));
if (!transFlow.getJSONArray("data").isEmpty()) { if (!transFlow.getJSONArray("data").isEmpty()) {
@ -920,7 +970,7 @@ public class TradeLogServiceImpl implements TradeLogService {
parmerters.put("royalpay_fee", takeDecimalOrDefault(analysis, "total_royalpay_fee", BigDecimal.ZERO)); parmerters.put("royalpay_fee", takeDecimalOrDefault(analysis, "total_royalpay_fee", BigDecimal.ZERO));
parmerters.put("incremental_fee", takeDecimalOrDefault(analysis, "total_incremental_surcharge", BigDecimal.ZERO)); parmerters.put("incremental_fee", takeDecimalOrDefault(analysis, "total_incremental_surcharge", BigDecimal.ZERO));
parmerters.put("incremental_gst", takeDecimalOrDefault(analysis, "total_incremental_tax", BigDecimal.ZERO)); parmerters.put("incremental_gst", takeDecimalOrDefault(analysis, "total_incremental_tax", BigDecimal.ZERO));
parmerters.put("royalpay_gst", analysis.getBigDecimal("tax_amount").subtract(analysis.getBigDecimal("total_incremental_tax")).setScale(2,RoundingMode.HALF_UP)); parmerters.put("royalpay_gst", analysis.getBigDecimal("tax_amount").subtract(analysis.getBigDecimal("total_incremental_tax")).setScale(2, RoundingMode.HALF_UP));
BigDecimal totalTransactionFee = analysis.getBigDecimal("total_transaction_fee").add(analysis.getBigDecimal("total_transaction_fee_tax")).setScale(2, RoundingMode.HALF_UP); BigDecimal totalTransactionFee = analysis.getBigDecimal("total_transaction_fee").add(analysis.getBigDecimal("total_transaction_fee_tax")).setScale(2, RoundingMode.HALF_UP);
BigDecimal totalRoyalpayFee = analysis.getBigDecimal("total_surcharge") BigDecimal totalRoyalpayFee = analysis.getBigDecimal("total_surcharge")
.subtract(analysis.getBigDecimal("total_transaction_fee")) .subtract(analysis.getBigDecimal("total_transaction_fee"))
@ -944,7 +994,7 @@ public class TradeLogServiceImpl implements TradeLogService {
BigDecimal realRoyalpayCharge = item.getBigDecimal("total_surcharge").add(taxAmount).subtract(transactionFee).subtract(transactionFeeTax).subtract(incrementalSurcharge).subtract(incrementalTax); BigDecimal realRoyalpayCharge = item.getBigDecimal("total_surcharge").add(taxAmount).subtract(transactionFee).subtract(transactionFeeTax).subtract(incrementalSurcharge).subtract(incrementalTax);
item.put("incremental_surcharge", incrementalSurcharge.add(incrementalTax).setScale(2, RoundingMode.HALF_UP)); item.put("incremental_surcharge", incrementalSurcharge.add(incrementalTax).setScale(2, RoundingMode.HALF_UP));
item.put("total_surcharge_intax", realRoyalpayCharge.setScale(2, RoundingMode.HALF_UP)); item.put("total_surcharge_intax", realRoyalpayCharge.setScale(2, RoundingMode.HALF_UP));
item.put("transaction_fee_intax", transactionFee.add(transactionFeeTax).setScale(2,RoundingMode.HALF_UP)); item.put("transaction_fee_intax", transactionFee.add(transactionFeeTax).setScale(2, RoundingMode.HALF_UP));
scaleDecimalVal(item, "display_amount", item.getString("currency")); scaleDecimalVal(item, "display_amount", item.getString("currency"));
String platformCurrency = PlatformEnvironment.getEnv().getForeignCurrency(); String platformCurrency = PlatformEnvironment.getEnv().getForeignCurrency();
scaleDecimalVal(item, "clearing_amount", platformCurrency); scaleDecimalVal(item, "clearing_amount", platformCurrency);
@ -970,7 +1020,8 @@ public class TradeLogServiceImpl implements TradeLogService {
} }
@Override @Override
public void exportTransFlowApi(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception { public void exportTransFlowApi(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws
Exception {
query.setClearing_status(-1); query.setClearing_status(-1);
String clientKey = "exportTransFlow:" + partner.getString("client_id"); String clientKey = "exportTransFlow:" + partner.getString("client_id");
@ -1020,7 +1071,8 @@ public class TradeLogServiceImpl implements TradeLogService {
} }
@Override @Override
public void exportExcel(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception { public void exportExcel(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws
Exception {
logger.debug("excel The method======= exportExcel() start......................."); logger.debug("excel The method======= exportExcel() start.......................");
JSONObject transFlow = listPartnerTransFlow(query, partner); JSONObject transFlow = listPartnerTransFlow(query, partner);
JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id")); JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id"));
@ -1105,7 +1157,8 @@ public class TradeLogServiceImpl implements TradeLogService {
} }
@Override @Override
public void exportExcelNew(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception { public void exportExcelNew(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws
Exception {
logger.debug("excel The method======= exportExcelNew() start......................."); logger.debug("excel The method======= exportExcelNew() start.......................");
JSONObject transFlow = listPartnerTransFlow(query, partner); JSONObject transFlow = listPartnerTransFlow(query, partner);
JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id")); JSONObject client = clientManager.getClientInfo(partner.getIntValue("client_id"));
@ -1926,7 +1979,8 @@ public class TradeLogServiceImpl implements TradeLogService {
} }
@Override @Override
public void exportExcelAllPartner(TradeLogQuery query, JSONObject partner, HttpServletResponse resp) throws Exception { public void exportExcelAllPartner(TradeLogQuery query, JSONObject partner, HttpServletResponse resp) throws
Exception {
logger.debug("excel The method======= exportExcel() start......................."); logger.debug("excel The method======= exportExcel() start.......................");
int clientId1 = partner.getIntValue("client_id"); int clientId1 = partner.getIntValue("client_id");
String timezone = partner.getJSONObject("client").getString("timezone"); String timezone = partner.getJSONObject("client").getString("timezone");

27
src/main/java/au/com/royalpay/payment/manage/tradelog/web/ManageTradelogController.java
Unescape View File

@ -27,6 +27,7 @@ public class ManageTradelogController {
private TradeLogService tradeLogService; private TradeLogService tradeLogService;
@Resource @Resource
private ClientManager clientManager; private ClientManager clientManager;
@RequestMapping(method = RequestMethod.GET) @RequestMapping(method = RequestMethod.GET)
@ReadOnlyConnection @ReadOnlyConnection
@RequireManager(role = {ManagerRole.ADMIN, ManagerRole.BD_USER, ManagerRole.OPERATOR, ManagerRole.FINANCIAL_STAFF, ManagerRole.SERVANT, ManagerRole.DIRECTOR}) @RequireManager(role = {ManagerRole.ADMIN, ManagerRole.BD_USER, ManagerRole.OPERATOR, ManagerRole.FINANCIAL_STAFF, ManagerRole.SERVANT, ManagerRole.DIRECTOR})
@ -34,7 +35,7 @@ public class ManageTradelogController {
return tradeLogService.listAllTradeLogs(query, manager); return tradeLogService.listAllTradeLogs(query, manager);
} }
@RequestMapping(value = "/incremental",method = RequestMethod.GET) @RequestMapping(value = "/incremental", method = RequestMethod.GET)
@ReadOnlyConnection @ReadOnlyConnection
@RequireManager(role = {ManagerRole.ADMIN, ManagerRole.BD_USER, ManagerRole.OPERATOR, ManagerRole.FINANCIAL_STAFF, ManagerRole.SERVANT, ManagerRole.DIRECTOR}) @RequireManager(role = {ManagerRole.ADMIN, ManagerRole.BD_USER, ManagerRole.OPERATOR, ManagerRole.FINANCIAL_STAFF, ManagerRole.SERVANT, ManagerRole.DIRECTOR})
public JSONObject listAllIncrementalTradeLogs(TradeLogQuery query, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { public JSONObject listAllIncrementalTradeLogs(TradeLogQuery query, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
@ -52,30 +53,30 @@ public class ManageTradelogController {
@ManagerMapping(value = "/report/excel", method = RequestMethod.GET) @ManagerMapping(value = "/report/excel", method = RequestMethod.GET)
@ReadOnlyConnection @ReadOnlyConnection
public void exportExcel(TradeLogQuery query, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, HttpServletResponse httpResponse) throws Exception { public void exportExcel(TradeLogQuery query, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, HttpServletResponse httpResponse) throws Exception {
tradeLogService.exportTransLog(query,manager,httpResponse); tradeLogService.exportTransLog(query, manager, httpResponse);
} }
@ManagerMapping(value = "/trans_flow",method = RequestMethod.GET,role = {ManagerRole.FINANCIAL_STAFF}) @ManagerMapping(value = "/trans_flow", method = RequestMethod.GET, role = {ManagerRole.FINANCIAL_STAFF})
@ReadOnlyConnection @ReadOnlyConnection
public JSONObject listTransFlow(TradeLogQuery query,@RequestParam(required = true) String client_moniker) throws Exception { public JSONObject listTransFlow(TradeLogQuery query, @RequestParam String client_moniker) throws Exception {
return tradeLogService.listPartnerTransFlowPage(query,getPartnerParams(client_moniker)); return tradeLogService.listPartnerTransFlowPage(query, getPartnerParams(client_moniker));
} }
@ManagerMapping(value = "/trans_flow/pdf", method = RequestMethod.GET,role = {ManagerRole.FINANCIAL_STAFF}) @ManagerMapping(value = "/trans_flow/pdf", method = RequestMethod.GET, role = {ManagerRole.FINANCIAL_STAFF})
@ReadOnlyConnection @ReadOnlyConnection
public void exportTransFlowPDF(TradeLogQuery query, @RequestParam(required = true) String client_moniker, HttpServletResponse httpResponse) throws Exception { public void exportTransFlowPDF(TradeLogQuery query, @RequestParam String client_moniker, HttpServletResponse httpResponse) throws Exception {
tradeLogService.exportTransFlow(query,getPartnerParams(client_moniker),httpResponse); tradeLogService.exportTransFlow(query, getPartnerParams(client_moniker), httpResponse);
} }
private JSONObject getPartnerParams(String clientMoniker){ private JSONObject getPartnerParams(String clientMoniker) {
JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker); JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker);
if(client==null){ if (client == null) {
throw new NotFoundException("Client Not Exists"); throw new NotFoundException("Client Not Exists");
} }
JSONObject params = new JSONObject(); JSONObject params = new JSONObject();
params.put("client_id",client.getIntValue("client_id")); params.put("client_id", client.getIntValue("client_id"));
params.put("client",client); params.put("client", client);
params.put("client_moniker",clientMoniker); params.put("client_moniker", clientMoniker);
return params; return params;
} }
} }

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

@ -1,11 +1,17 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html lang="en" xmlns:th="http://www.w3.org/1999/xhtml"> <html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1"/>
<title>Invoice</title> <meta http-equiv="cache-control" content="max-age=0"/>
<meta http-equiv="cache-control" content="no-cache"/>
<meta http-equiv="expires" content="0"/>
<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT"/>
<title> [[${#dates.format((new java.util.Date()), 'dd-MM-yyyy')}]] [[${parmerters.partnerCode}]] Invoice</title>
<link rel="stylesheet" href="/static/templates/mch_invoice.css"/>
<style type="text/css"> <style type="text/css">
.divcontent{ .divcontent {
width: 100%; width: 100%;
height: auto; height: auto;
float: left; float: left;
@ -13,31 +19,36 @@
align-items: start; align-items: start;
display: flex; display: flex;
text-align: center; text-align: center;
margin-top: 5%;
margin-left: 5%;
margin-right: 5%;
} }
.divcontent_left{
.divcontent_left {
width: 50%; width: 50%;
height: auto; height: auto;
text-align:left; text-align: left;
float: left ; float: left;
white-space:normal; white-space: normal;
word-break:break-all; word-break: break-all;
word-wrap:break-word; word-wrap: break-word;
} }
.divcontent_right{
.divcontent_right {
width: 50%; width: 50%;
height: auto; height: auto;
float:right; float: right;
text-align:left; text-align: left;
white-space:normal; white-space: normal;
word-break:break-all; word-break: break-all;
word-wrap:break-word; word-wrap: break-word;
} }
.divinvoicesTitle{
.divinvoicesTitle {
width: 100%; width: 100%;
height: auto; height: auto;
float: left; float: left;
background:saddlebrown; background: #FF6600;
display: flex; display: flex;
align-items: center; align-items: center;
text-align: left; text-align: left;
@ -45,57 +56,69 @@
padding-bottom: 10px; padding-bottom: 10px;
color: white; color: white;
} }
.divinvoicesContent{
.divinvoicesContent {
width: 100%; width: 100%;
height: auto; height: auto;
float: left; float: left;
background: white;; background: white;;
display: flex; display: flex;
flex-wrap:wrap; flex-wrap: wrap;
align-items: center; align-items: center;
text-align: left; text-align: left;
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
color: black; color: black;
} }
.divinvoiceItem{
.divinvoiceItem {
height: auto; height: auto;
float: left; float: left;
padding-left: 3px; padding-left: 3px;
white-space:normal; white-space: normal;
word-break:break-all; word-break: break-all;
word-wrap:break-word; word-wrap: break-word;
}
.spantitle {
color: #FF6600;
font-size: 20px;
height: auto;
font-weight: bold;
}
.divSumary {
child-align: middle;
border-bottom: 2px solid #000;
margin-bottom: 10px;
padding-bottom: 10px;
width: 85%;
}
.spancontent-title {
width: 40%;
float: left;
color: #000000;
font-size: 17px;
font-weight: bold;
vertical-align: center;
} }
.spantitle{
color: #bf7a12; .spancontent-value {
font-size: 20px; color: #000000;
height: auto; font-size: 17px;
font-weight: bold; font-weight: bold;
} padding-left: 5px;
.divSumary{ vertical-align: center;
child-align: middle;
} }
.spancontent-title{
width: 40%; .statement_title {
float: left; padding-bottom: 2%;
color: #000000; padding-top: 2%;
font-size: 17px; float: left;
font-weight: bold; padding-left: 5%;
vertical-align: center;
}
.spancontent-value{
color: #000000;
font-size: 17px;
font-weight: bold;
padding-left: 5px;
vertical-align: center;
}
.hrclass{
background-color: #bf7a12;
height: 1px;
} }
</style> </style>
</head> </head>
@ -103,42 +126,48 @@
<div class="divcontent"> <div class="divcontent">
<div class="divcontent_left"> <div class="divcontent_left">
<img src="https://mpay.royalpay.com.au/static/images/logo_new.jpg" alt="" width="100px" height="100px"/><br/> <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"/>
<br/>
<span>Tunnel Show Pty Ltd trading as RoyalPay</span><br/> <span>Tunnel Show Pty Ltd trading as RoyalPay</span><br/>
<span>ABN 16 601 619 685 Representative of AFSL 448066</span><br/> <span>ABN 16 601 619 685</span><br/>
<span th:text="${parmerters.clientName}"></span><br/> <span> Representative of AFSL 448066</span>
<span th:text="${parmerters.clientAddress}"></span> <br/><br/>
<span th:text="${parmerters.clientName}"></span><br/>
</div> </div>
<div class="divcontent_right"> <div class="divcontent_right">
<div style="padding-bottom: 15px"> <div style="padding-bottom: 10%">
<span class="spantitle">Tax Invoice </span> <span class="spantitle">Tax Invoice </span>
</div> </div>
<div class="divSumary"><span class="spancontent-title">Merchant code</span><span class="spancontent-value" th:text="${parmerters.partnerCode}"></span></div> <div class="divSumary"><span class="spancontent-title">Merchant code</span><span class="spancontent-value"
<hr class="hrclass"/> th:text="${parmerters.partnerCode}"></span>
<div class="divSumary"> <span class="spancontent-title">Statement</span><span class="spancontent-value" th:text="${parmerters.dateRange}"></span></div> </div>
<hr class="hrclass"/> <div class="divSumary"><span class="spancontent-title">Statement</span><span class="spancontent-value"
<div class="divSumary"> <span class="spancontent-title">Issue Date</span><span class="spancontent-value" >-</span></div> th:text="${parmerters.dateRange}"></span>
<hr class="hrclass"/> </div>
<div class="divSumary"> <span class="spancontent-title">Current</span><span class="spancontent-value" th:text="${parmerters.balance}"></span></div> <div class="divSumary"><span class="spancontent-title">
<hr class="hrclass"/> Issue Date</span>
<span class="spancontent-value"
th:text="${#dates.format((new java.util.Date()), 'dd-MM-yyyy')}"></span>
</div>
<div class="divSumary"><span class="spancontent-title">Current</span><span class="spancontent-value"
th:text="${parmerters.balance}"></span>
</div>
</div> </div>
</div> </div>
<div style="padding-bottom: 1px;padding-top:10px;float: left"> <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>
</div> </div>
<div class="divinvoiceItem" style="width: 22%"> <div class="divinvoiceItem" style="width: 22%">
<span>Transaction ID</span> <span>Transaction ID</span>
</div> </div>
<div class="divinvoiceItem" style="width: 10%"> <div class="divinvoiceItem" style="width: 10%">
<span>Debit</span> <span>Debit</span>
</div> </div>
@ -146,15 +175,15 @@
<span>Credit</span> <span>Credit</span>
</div> </div>
<div class="divinvoiceItem" style="width: 14%"> <div class="divinvoiceItem" style="width: 14%">
<span>Service Fee for RoyalPay (GST inclu)</span> <span>Service Fee for RoyalPay (GST inclu)</span>
</div> </div>
<div class="divinvoiceItem" style="width: 12%"> <div class="divinvoiceItem" style="width: 12%">
<span>Service fee for Mini Program(GST Inclu)</span> <span>Service fee for Mini Program(GST Inclu)</span>
</div> </div>
<div class="divinvoiceItem" style="width: 11%"> <div class="divinvoiceItem" style="width: 11%">
<span>Settlement Amount</span> <span>Settlement Amount</span>
</div> </div>
</div> </div>
@ -163,33 +192,30 @@
<div class="divinvoiceItem" style="width: 16%"> <div class="divinvoiceItem" style="width: 16%">
<span th:text="${invoicedata.transaction_time}?:'-'"></span> <span th:text="${invoicedata.transaction_time}?:'-'"></span>
</div> </div>
<div class="divinvoiceItem" style="width: 22%"> <div class="divinvoiceItem" style="width: 22%">
<span th:text="${invoicedata.order_id}?:'-'"></span> <span th:text="${invoicedata.order_id}?:'-'"></span>
</div> </div>
<div class="divinvoiceItem" style="width: 10%;padding-left: 10px" > <div class="divinvoiceItem" style="width: 10%;padding-left: 10px">
<span th:text="${invoicedata.debit}?:'-'">-</span> <span th:text="${invoicedata.debit}?:'-'">-</span>
</div> </div>
<div class="divinvoiceItem" style="width: 10%"> <div class="divinvoiceItem" style="width: 10%">
<span th:text="${invoicedata.credit}?:'-'">-</span> <span th:text="${invoicedata.credit}?:'-'">-</span>
</div> </div>
<div class="divinvoiceItem" style="width: 14%"> <div class="divinvoiceItem" style="width: 14%">
<span th:text="${invoicedata.real_royalpay_surcharge}?:'-'"></span> <span th:text="${invoicedata.real_royalpay_surcharge}?:'-'"></span>
</div> </div>
<div class="divinvoiceItem" style="width: 12%"> <div class="divinvoiceItem" style="width: 12%">
<span th:text="${invoicedata.incremental_surcharge}?:'-'"></span> <span th:text="${invoicedata.incremental_surcharge}?:'-'"></span>
</div> </div>
<div class="divinvoiceItem" style="width: 11%"> <div class="divinvoiceItem" style="width: 11%">
<span th:text="${invoicedata.settle_amount}?:'-'" ></span> <span th:text="${invoicedata.settle_amount}?:'-'"></span>
</div> </div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>

108
src/main/ui/static/templates/mch_invoice.css
Unescape View File

@ -0,0 +1,108 @@
.divcontent {
width: 100%;
height: auto;
float: left;
margin: 1px;
align-items: start;
display: flex;
text-align: center;
margin-top: 5%;
margin-left: 5%;
margin-right: 5%;
}
.divcontent_left {
width: 50%;
height: auto;
text-align: left;
float: left;
white-space: normal;
word-break: break-all;
word-wrap: break-word;
}
.divcontent_right {
width: 50%;
height: auto;
float: right;
text-align: left;
white-space: normal;
word-break: break-all;
word-wrap: break-word;
}
.divinvoicesTitle {
width: 100%;
height: auto;
float: left;
background: #FF6600;
display: flex;
align-items: center;
text-align: left;
padding-top: 10px;
padding-bottom: 10px;
color: white;
}
.divinvoicesContent {
width: 100%;
height: auto;
float: left;
background: white;;
display: flex;
flex-wrap: wrap;
align-items: center;
text-align: left;
padding-top: 10px;
padding-bottom: 10px;
color: black;
}
.divinvoiceItem {
height: auto;
float: left;
padding-left: 3px;
white-space: normal;
word-break: break-all;
word-wrap: break-word;
}
.spantitle {
color: #FF6600;
font-size: 20px;
height: auto;
font-weight: bold;
}
.divSumary {
child-align: middle;
border-bottom: 2px solid #000;
margin-bottom: 10px;
padding-bottom: 10px;
width: 85%;
}
.spancontent-title {
width: 40%;
float: left;
color: #000000;
font-size: 17px;
font-weight: bold;
vertical-align: center;
}
.spancontent-value {
color: #000000;
font-size: 17px;
font-weight: bold;
padding-left: 5px;
vertical-align: center;
}
.statement_title{
padding-bottom: 2%;
padding-top: 2%;
float: left;
padding-left: 5%;
}
Write Preview
Loading…
Cancel
Save