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

Merge branch 'develop'

Browse Source
master
luoyang 5 years ago
parent 79bff22757 f4834125cc
commit efe494d50b
6 changed files with 313 additions and 283 deletions
Show Stats Download Patch File Download Diff File

4
src/document/cn/apis.js
Unescape View File

@ -591,6 +591,9 @@
* @apiSuccess (transactions) {int} input_amount 订单输入金额，单位是货币最小单位
* @apiSuccess (transactions) {int} customer_payment_amount 用户实际支付金额，单位是货币最小单位
* @apiSuccess (transactions) {int} settle_amount 结算金额，币种为AUD，单位是货币最小单位
* @apiSuccess (transactions) {int} transfer_amount 打款金额（结算金额-手续费-GST），币种为AUD，单位是货币最小单位
* @apiSuccess (transactions) {int} surcharge 手续费，币种为AUD，单位是货币最小单位
* @apiSuccess (transactions) {int} gst GST金额，币种为AUD，单位是货币最小单位
* @apiSuccess (transactions) {double} exchange_rate 使用汇率
* @apiSuccess (transactions) {String} remark 备注
*
@ -655,6 +658,7 @@
* @apiSuccess (transactions) {int} settle_amount 结算金额，单位是AUD分
* @apiSuccess (transactions) {String} surcharge_rate 手续费费率(x%)
* @apiSuccess (transactions) {int} surcharge 手续费金额，单位是AUD分
* @apiSuccess (transactions) {int} gst GST金额，单位是AUD分
* @apiSuccess (transactions) {int} transfer_amount 打款金额，单位是AUD分
* @apiSuccess (transactions) {double} exchange_rate 使用汇率
* @apiSuccess (transactions) {String} remark 备注

4
src/document/en/apis.js
Unescape View File

@ -600,6 +600,9 @@
* @apiSuccess (transactions) {int} total_amount Total payment amount, which uses the base unit of order currency
* @apiSuccess (transactions) {int} input_amount Order input amount, which uses the base unit of order currency
* @apiSuccess (transactions) {int} settle_amount Settle amount, AUD cents
* @apiSuccess (transactions) {int} transfer_amount Final settle amount(settle amount - surcharge - gst), AUD cents
* @apiSuccess (transactions) {int} surcharge surcharge, AUD cents
* @apiSuccess (transactions) {int} gst GST, AUD cents
* @apiSuccess (transactions) {double} exchange_rate Using exchange rate
* @apiSuccess (transactions) {String} remark Remark
*
@ -665,6 +668,7 @@
* @apiSuccess (transactions) {int} settle_amount Amount to make settlement, AUD cents
* @apiSuccess (transactions) {String} surcharge_rate Rate of surcharge (x%)
* @apiSuccess (transactions) {int} surcharge Surcharge amount, AUD cents
* @apiSuccess (transactions) {int} gst GST, AUD cents
* @apiSuccess (transactions) {int} transfer_amount Amount send to merchant's bank account, AUD cents
* @apiSuccess (transactions) {double} exchange_rate Using exchange rate
* @apiSuccess (transactions) {String} remark Remark

11
src/main/java/au/com/royalpay/payment/manage/support/serverless/qcloud/QCloudServerlessTrigger.java
Unescape View File

@ -14,8 +14,10 @@ import org.springframework.http.ResponseEntity;
import org.springframework.http.converter.StringHttpMessageConverter;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.server.ResponseStatusException;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
/**
* Create by davep at 2019-08-12 9:31
@ -35,6 +37,8 @@ public class QCloudServerlessTrigger implements ServerlessFunctionTrigger {
this.secretKey = secretKey;
this.region = region;
this.restTemplate = new RestTemplateBuilder()
.setConnectTimeout(Duration.ofMinutes(5))
.setReadTimeout(Duration.ofMinutes(5))
.messageConverters(new StringHttpMessageConverter(StandardCharsets.UTF_8))
.build();
}
@ -44,7 +48,11 @@ public class QCloudServerlessTrigger implements ServerlessFunctionTrigger {
public JSONObject triggerFunction(String function, JSONObject params) {
ServerLessFunctionInvokeRequest request = new ServerLessFunctionInvokeRequest(secretId, secretKey, region, function, params);
ResponseEntity<String> resp = restTemplate.exchange(request.request(), String.class);
if (resp.getStatusCode().is2xxSuccessful()) {
JSONObject data = JSON.parseObject(resp.getBody());
if (data == null) {
throw new ServerErrorException("Invoke function " + function + " failed:[no response]");
}
JSONObject response = data.getJSONObject("Response");
String requestId = response.getString("RequestId");
JSONObject result = response.getJSONObject("Result");
@ -57,6 +65,9 @@ public class QCloudServerlessTrigger implements ServerlessFunctionTrigger {
String retMsg = result.getString("RetMsg");
return StringUtils.isNotEmpty(retMsg) ? JSON.parseObject(retMsg) : null;
}
} else {
throw new ResponseStatusException(resp.getStatusCode(), "Invoke function " + function + " failed:[no response]");
}
}

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

@ -65,14 +65,12 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
@ -467,29 +465,29 @@ public class TradeLogServiceImpl implements TradeLogService {
}
private JSONObject listPartnerTransFlow(TradeLogQuery query, JSONObject partner) throws Exception {
int client_id = partner.getIntValue("client_id");
int clientId = partner.getIntValue("client_id");
String timezone = partner.getJSONObject("client").getString("timezone");
JSONObject params = query.toParams(timezone);
clientManager.validateClients(client_id, params);
params.put("client_id", client_id);
clientManager.validateClients(clientId, params);
params.put("client_id", clientId);
List<JSONObject> logs = transactionMapper.listTransFlow(params);
if (client_id!=1563){
logs.stream().forEach(p -> {
String login_id = p.getString("login_id");
if (StringUtils.isNotEmpty(login_id)) {
p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : login_id+":"+p.getString("order_detail")));
if (clientId != 1563) {
logs.forEach(p -> {
String loginId = p.getString("login_id");
if (StringUtils.isNotEmpty(loginId)) {
p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : loginId + ":" + p.getString("order_detail")));
} else {
p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : p.getString("order_detail")));
}
});
}
TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy HH:mm:ss", Arrays.asList("transaction_time"));
TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy HH:mm:ss", Collections.singletonList("transaction_time"));
TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy", Collections.singletonList("clearing_time"));
final JSONObject analysis = analysisTransLogs(logs);
JSONObject result = new JSONObject();
result.put("data", logs);
// JSONObject analysis = transactionMapper.analysisTransFlow(params);
analysis.put("balance", transactionMapper.analysisBalance(params));
if (analysis.containsKey("paid_fee") && analysis.containsKey("refund_fee")) {
analysis.put("actual_fee", analysis.getBigDecimal("paid_fee").add(analysis.getBigDecimal("refund_fee")));
@ -590,13 +588,12 @@ public class TradeLogServiceImpl implements TradeLogService {
@Override
public void exportTransFlow(TradeLogQuery query, JSONObject partner, HttpServletResponse response) throws Exception {
// File jasperFile = trans_flow.getFile();
JSONObject transFlow = listPartnerTransFlow(query, partner);
JSONObject analysis = transFlow.getJSONObject("analysis");
JSONObject client = clientManager.getClientInfo(Integer.parseInt(query.getClient_ids()[0]));
if (!transFlow.getJSONArray("data").isEmpty()) {
try {
List<JSONObject> dataList = (List<JSONObject>) transFlow.get("data");
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") : "");
@ -662,10 +659,9 @@ public class TradeLogServiceImpl implements TradeLogService {
logger.debug("excel The method======= exportExcel() start.......................");
JSONObject transFlow = listPartnerTransFlow(query, partner);
JSONObject client = clientManager.getClientInfo(Integer.parseInt(query.getClient_ids()[0]));
// JSONObject analysis = transFlow.getJSONObject("analysis");
if (transFlow.getJSONArray("data").size() > 0) {
if (!transFlow.getJSONArray("data").isEmpty()) {
try {
List<JSONObject> dataList = (List<JSONObject>) transFlow.get("data");
List<JSONObject> dataList = transFlow.getJSONArray("data").toJavaList(JSONObject.class);
String transType;
JSONObject device;
int status;
@ -689,16 +685,13 @@ public class TradeLogServiceImpl implements TradeLogService {
parmerters.put("dateTo", StringUtils.isNotBlank(query.getDateto()) ? query.getDateto() : DateFormatUtils.format(new Date(), "yyyyMMdd"));
parmerters.put("partnerCode", client.getString("client_moniker"));
// parmerters.put("actual_fee", analysis.containsKey("actual_fee") ?
// analysis.getBigDecimal("actual_fee") : 0);
JRDataSource jrDataSource = new JRBeanCollectionDataSource(dataList);
response.setContentType("application/vnd.ms-excel");
String fileName = StringUtils.isEmpty(parmerters.getString("dateFrom")) ? parmerters.getString("dateTo")
: (parmerters.getString("dateFrom") + "~" + parmerters.getString("dateTo"));
// String fileName = new String(URLEncoder.encode(defaultname,"utf8"));
response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
OutputStream outputStream = response.getOutputStream();
JasperPrint jasperPrint = JasperFillManager.fillReport(trans_excel.getInputStream(), parmerters, jrDataSource);
// JRXlsExporter exporter = new JRXlsExporter();
JRXlsxExporter exporter = new JRXlsxExporter();
ExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
exporter.setExporterInput(exporterInput);
@ -732,12 +725,16 @@ public class TradeLogServiceImpl implements TradeLogService {
row.createCell(8, Cell.CELL_TYPE_STRING).setCellValue(data.getString("transaction_amount"));
row.createCell(9, Cell.CELL_TYPE_STRING).setCellValue(data.getString("currency"));
row.createCell(10, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clearing_amount"));
row.createCell(11, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type").equals("clearing")?"-":data.getBigDecimal("exchange_rate").toString());
row.createCell(12, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type"));
row.createCell(13, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clear_status"));
row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(data.getString("gateway"));
row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(data.getString("order_detail"));
row.createCell(16, Cell.CELL_TYPE_STRING).setCellValue(data.getString("dev_id"));
row.createCell(11, Cell.CELL_TYPE_STRING).setCellValue(data.getString("settle_amount"));
row.createCell(12, Cell.CELL_TYPE_STRING).setCellValue(data.getString("total_surcharge"));
row.createCell(13, Cell.CELL_TYPE_STRING).setCellValue(data.getString("tax_amount"));
row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clearing_time"));
row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type").equals("clearing") ? "-" : data.getBigDecimal("exchange_rate").toString());
row.createCell(16, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type"));
row.createCell(17, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clear_status"));
row.createCell(18, Cell.CELL_TYPE_STRING).setCellValue(data.getString("gateway"));
row.createCell(19, Cell.CELL_TYPE_STRING).setCellValue(data.getString("order_detail"));
row.createCell(20, Cell.CELL_TYPE_STRING).setCellValue(data.getString("dev_id"));
}
@Override
@ -745,9 +742,9 @@ public class TradeLogServiceImpl implements TradeLogService {
logger.debug("excel The method======= exportExcelNew() start.......................");
JSONObject transFlow = listPartnerTransFlow(query, partner);
JSONObject client = clientManager.getClientInfo(Integer.parseInt(query.getClient_ids()[0]));
if (transFlow.getJSONArray("data").size() > 0) {
List<JSONObject> dataList = (List<JSONObject>) transFlow.get("data");
HSSFWorkbook workbook = new HSSFWorkbook();
if (!transFlow.getJSONArray("data").isEmpty()) {
List<JSONObject> dataList = transFlow.getJSONArray("data").toJavaList(JSONObject.class);
try (HSSFWorkbook workbook = new HSSFWorkbook()) {
// 声明一个工作薄
// 生成一个表格
HSSFSheet sheet = workbook.createSheet("trans_excel");
@ -757,32 +754,32 @@ public class TradeLogServiceImpl implements TradeLogService {
HSSFCellStyle style = workbook.createCellStyle();
// 设置这些样式
style.setFillForegroundColor(HSSFColor.LIGHT_ORANGE.index);
style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND);
style.setBorderBottom(HSSFCellStyle.BORDER_THIN);
style.setBorderLeft(HSSFCellStyle.BORDER_THIN);
style.setBorderRight(HSSFCellStyle.BORDER_THIN);
style.setBorderTop(HSSFCellStyle.BORDER_THIN);
style.setAlignment(HSSFCellStyle.ALIGN_CENTER);
style.setFillPattern(CellStyle.SOLID_FOREGROUND);
style.setBorderBottom(CellStyle.BORDER_THIN);
style.setBorderLeft(CellStyle.BORDER_THIN);
style.setBorderRight(CellStyle.BORDER_THIN);
style.setBorderTop(CellStyle.BORDER_THIN);
style.setAlignment(CellStyle.ALIGN_CENTER);
HSSFFont font = workbook.createFont();
// font.setColor(HSSFColor.VIOLET.index);
font.setFontHeightInPoints((short) 16);
font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
font.setBoldweight(Font.BOLDWEIGHT_BOLD);
// 把字体应用到当前的样式
style.setFont(font);
HSSFCellStyle style2 = workbook.createCellStyle();
// 设置这些样式
style2.setFillForegroundColor(HSSFColor.WHITE.index);
style2.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND);
style2.setBorderBottom(HSSFCellStyle.BORDER_THIN);
style2.setBorderLeft(HSSFCellStyle.BORDER_THIN);
style2.setBorderRight(HSSFCellStyle.BORDER_THIN);
style2.setBorderTop(HSSFCellStyle.BORDER_THIN);
style2.setAlignment(HSSFCellStyle.ALIGN_CENTER);
style2.setFillPattern(CellStyle.SOLID_FOREGROUND);
style2.setBorderBottom(CellStyle.BORDER_THIN);
style2.setBorderLeft(CellStyle.BORDER_THIN);
style2.setBorderRight(CellStyle.BORDER_THIN);
style2.setBorderTop(CellStyle.BORDER_THIN);
style2.setAlignment(CellStyle.ALIGN_CENTER);
HSSFFont font2 = workbook.createFont();
// font.setColor(HSSFColor.VIOLET.index);
font2.setFontHeightInPoints((short) 12);
font2.setBoldweight(HSSFFont.BOLDWEIGHT_NORMAL);
font2.setBoldweight(Font.BOLDWEIGHT_NORMAL);
// 把字体应用到当前的样式
style2.setFont(font2);
HSSFRow row0 = sheet.createRow(0);
@ -818,15 +815,16 @@ public class TradeLogServiceImpl implements TradeLogService {
cell2.setCellStyle(style2);
cell3.setCellStyle(style2);
cell4.setCellStyle(style2);
HSSFRichTextString text0 = new HSSFRichTextString(dataList.get(i).getString("transaction_time"));
HSSFRichTextString text1 = new HSSFRichTextString(dataList.get(i).getString("order_id2"));
String debit = dataList.get(i).getString("transaction_type").equals("Debit") ? dataList.get(i).getBigDecimal("clearing_amount").toString()
JSONObject dataItem = dataList.get(i);
HSSFRichTextString text0 = new HSSFRichTextString(dataItem.getString("transaction_time"));
HSSFRichTextString text1 = new HSSFRichTextString(dataItem.getString("order_id2"));
String debit = dataItem.getString("transaction_type").equals("Debit") ? dataItem.getBigDecimal("clearing_amount").toString()
: "-";
HSSFRichTextString text2 = new HSSFRichTextString(debit);
String credit = dataList.get(i).getString("transaction_type").equals("Credit") ? dataList.get(i).getBigDecimal("clearing_amount").toString()
String credit = dataItem.getString("transaction_type").equals("Credit") ? dataItem.getBigDecimal("clearing_amount").toString()
: "-";
HSSFRichTextString text3 = new HSSFRichTextString(credit);
HSSFRichTextString text4 = new HSSFRichTextString(dataList.get(i).getString("order_detail"));
HSSFRichTextString text4 = new HSSFRichTextString(dataItem.getString("order_detail"));
cell0.setCellValue(text0);
cell1.setCellValue(text1);
cell2.setCellValue(text2);
@ -851,6 +849,7 @@ public class TradeLogServiceImpl implements TradeLogService {
e.printStackTrace();
}
}
}
}
@ -862,10 +861,10 @@ public class TradeLogServiceImpl implements TradeLogService {
@Override
public JSONObject listSettlementLog(TradeLogQuery query, JSONObject partner) {
int client_id = partner.getIntValue("client_id");
int clientId = partner.getIntValue("client_id");
String timezone = partner.getJSONObject("client").getString("timezone");
JSONObject params = query.toParams(timezone);
params.put("client_id", client_id);
params.put("client_id", clientId);
PageList<JSONObject> logs = transactionMapper.listSettlementLog(params,
new PageBounds(query.getPage(), query.getLimit(), Order.formString("clearing_time.desc")));
JSONObject result = PageListUtils.buildPageListResult(logs);
@ -879,7 +878,7 @@ public class TradeLogServiceImpl implements TradeLogService {
if (clearingLog.getBooleanValue("editable")) {
result.put("padding", true);
logs.get(0).put("padding", true);
logger.info("##editable"+clearingLog.getBooleanValue("editable"));
logger.info("##editable{}", clearingLog.getBooleanValue("editable"));
}
}
}
@ -889,8 +888,7 @@ public class TradeLogServiceImpl implements TradeLogService {
@Override
public Double getClientUnClearedAmount(JSONObject partner) {
Double unCleared = transactionMapper.getClientUnClearedAmount(partner.getIntValue("client_id"));
return unCleared;
return transactionMapper.getClientUnClearedAmount(partner.getIntValue("client_id"));
}
public static JSONObject tunnel() {
@ -1104,11 +1102,11 @@ public class TradeLogServiceImpl implements TradeLogService {
clearings.addAll(mpPaymentApi.settlementLogs(from, to, mch.getMerchantId()));
}
for (SettlementLog clear : clearings) {
JSONObject date_params = new JSONObject();
date_params.put("from", clear.getStart());
date_params.put("to", clear.getEnd());
date_params.put("clearing_date", clear.getSettlementDate());
List<JSONObject> oneClear = transactionMapper.getMerchantAmount(date_params);
JSONObject dateParams = new JSONObject();
dateParams.put("from", clear.getStart());
dateParams.put("to", clear.getEnd());
dateParams.put("clearing_date", clear.getSettlementDate());
List<JSONObject> oneClear = transactionMapper.getMerchantAmount(dateParams);
Date now = new Date();
for (JSONObject clientClear : oneClear) {
// JSONObject params = new JSONObject();
@ -1121,7 +1119,7 @@ public class TradeLogServiceImpl implements TradeLogService {
austracDataMapper.delete(clientClear.getIntValue("client_id"), clientClear.getDate("clearing_time"));
BigDecimal lastTransTotal = austracDataMapper.getClientLastTransactionTotal(clientClear.getIntValue("client_id"),
clientClear.getDate("clearing_time"));
clientClear.put("clearing_amount", clientClear.getBigDecimal("clearing_amount").setScale(0, BigDecimal.ROUND_DOWN));
clientClear.put("clearing_amount", clientClear.getBigDecimal("clearing_amount").setScale(0, RoundingMode.DOWN));
if (lastTransTotal != null && lastTransTotal.compareTo(new BigDecimal(0)) < 0) {
clientClear.put("clearing_amount", clientClear.getBigDecimal("clearing_amount").add(lastTransTotal));
}
@ -1132,8 +1130,8 @@ public class TradeLogServiceImpl implements TradeLogService {
clientClear.put("bank_settlement_data", clear.getBankSettlementDate());
austracDataMapper.save(clientClear);
}
JSONObject fee = transactionMapper.getSumMerchantAmount(date_params);
fee.put("clearing_amount", clear.getSettlementFee().subtract(fee.getBigDecimal("clearing_amount")).setScale(0, BigDecimal.ROUND_DOWN));
JSONObject fee = transactionMapper.getSumMerchantAmount(dateParams);
fee.put("clearing_amount", clear.getSettlementFee().subtract(fee.getBigDecimal("clearing_amount")).setScale(0, RoundingMode.DOWN));
fee.put("clearing_time", clear.getSettlementDate());
fee.put("order_time", clear.getSettlementDate());
fee.put("create_time", now);
@ -1164,7 +1162,7 @@ public class TradeLogServiceImpl implements TradeLogService {
params.put("client_id", client.getIntValue("client_id"));
List<JSONObject> logs = orderMapper.listOrdersByClientsNoPages(params);
if (null != logs && logs.size() > 0) {
if (!logs.isEmpty()) {
int count = 0;
for (JSONObject object : logs) {
if (object.getIntValue("clearing_status") == 2 && object.getIntValue("client_id") == client.getIntValue("client_id")) {
@ -1207,18 +1205,14 @@ public class TradeLogServiceImpl implements TradeLogService {
}
List<JSONObject> clientOrderList = transactionMapper.getClientOrderByTransactionTime(params);
List<Integer> clientOrders = new ArrayList<>(clientOrderList.size());
clientOrderList.parallelStream().forEach(p->{
clientOrders.add(p.getInteger("clearing_order"));
});
clientOrderList.parallelStream().forEach(p -> clientOrders.add(p.getInteger("clearing_order")));
List<JSONObject> settlementLogDetailList = transactionMapper.getSettlementLogDetailList(clientOrders);
OutputStream ous = null;
try {
try (OutputStream ous = resp.getOutputStream();
Workbook wb = new XSSFWorkbook()) {
JSONObject clearDetailTotal = transactionMapper.getClearDetailTotal(params);
resp.setContentType("application/octet-stream;");
resp.addHeader("Content-Disposition",
"attachment; filename=" + "Merchant_Settlement_Info_" + begin + "_" + end + ".xlsx");
ous = resp.getOutputStream();
Workbook wb = new XSSFWorkbook();
Cell cell = null;
Font font = wb.createFont();
font.setBoldweight(Font.BOLDWEIGHT_BOLD);
@ -1229,7 +1223,7 @@ public class TradeLogServiceImpl implements TradeLogService {
int rowNum = 0;
Row row = sheet.createRow(rowNum);
String[] title = {"order Id", "Client Order Id", "Transaction Time", "Channel", "Gateway", "Exchange Rate", "Transaction Type", "Currency",
"Input Amount", "Total Amount", "Clearing Amount", "Sruchange Rate", "Settle Amount", "Remark", "Dev No","Company Name","Short Name","Settment Date"};
"Input Amount", "Total Amount", "Clearing Amount", "Sruchange Rate", "Settle Amount", "Surcharge", "GST", "Remark", "Dev No", "Company Name", "Short Name", "Settlement Date"};
String[] analysis = {"Total Credit", "Total Debit", "Gross Amount", "Total Charge", "Net Amount"};
for (int i = 0; i < title.length; i++) {
row.createCell(i, Cell.CELL_TYPE_STRING).setCellValue(title[i]);
@ -1251,26 +1245,30 @@ public class TradeLogServiceImpl implements TradeLogService {
} else {
row.createCell(4, Cell.CELL_TYPE_STRING).setCellValue("-");
}
row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(settle.getBigDecimal("exchange_rate").setScale(5, BigDecimal.ROUND_DOWN).toPlainString());
row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(settle.getBigDecimal("exchange_rate").setScale(5, RoundingMode.DOWN).toPlainString());
row.createCell(6, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("transaction_type"));
row.createCell(7, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("transaction_currency"));
row.createCell(8, Cell.CELL_TYPE_STRING).setCellValue(settle.getBigDecimal("display_amount") == null ? ""
: settle.getBigDecimal("display_amount").setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
: settle.getBigDecimal("display_amount").setScale(2, RoundingMode.DOWN).toPlainString());
row.createCell(9, Cell.CELL_TYPE_STRING).setCellValue(settle.getBigDecimal("transaction_amount") == null ? ""
: settle.getBigDecimal("transaction_amount").setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
: settle.getBigDecimal("transaction_amount").setScale(2, RoundingMode.DOWN).toPlainString());
row.createCell(10, Cell.CELL_TYPE_STRING).setCellValue(settle.getBigDecimal("clearing_amount") == null ? ""
: settle.getBigDecimal("clearing_amount").setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
: settle.getBigDecimal("clearing_amount").setScale(2, RoundingMode.DOWN).toPlainString());
row.createCell(11, Cell.CELL_TYPE_STRING).setCellValue(settle.getBigDecimal("rate") == null ? "" : settle.getBigDecimal("rate").toPlainString() + "%");
row.createCell(12, Cell.CELL_TYPE_STRING).setCellValue(settle.getBigDecimal("settle_amount") == null ? ""
: settle.getBigDecimal("settle_amount").setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
row.createCell(13, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("remark"));
: settle.getBigDecimal("settle_amount").setScale(2, RoundingMode.DOWN).toPlainString());
row.createCell(13, Cell.CELL_TYPE_STRING).setCellValue(settle.getBigDecimal("total_surcharge") == null ? ""
: settle.getBigDecimal("total_surcharge").setScale(2, RoundingMode.DOWN).toPlainString());
row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(settle.getBigDecimal("tax_amount") == null ? ""
: settle.getBigDecimal("tax_amount").setScale(2, RoundingMode.DOWN).toPlainString());
row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("remark"));
device = clientDeviceMapper.find(settle.getString("dev_id"));
if (device != null)
clientDevId = device.getString("client_dev_id");
row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(clientDevId);
row.createCell(15,Cell.CELL_TYPE_STRING).setCellValue(settle.getString("company_name"));
row.createCell(16,Cell.CELL_TYPE_STRING).setCellValue(settle.getString("short_name"));
row.createCell(17,Cell.CELL_TYPE_STRING).setCellValue(settle.getString("settle_date"));
row.createCell(16, Cell.CELL_TYPE_STRING).setCellValue(clientDevId);
row.createCell(17, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("company_name"));
row.createCell(18, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("short_name"));
row.createCell(19, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("settle_date"));
}
row = sheet.createRow(++rowNum);
for (int i = 0; i < analysis.length; i++) {
@ -1289,9 +1287,8 @@ public class TradeLogServiceImpl implements TradeLogService {
ous.flush();
} catch (IOException e) {
e.printStackTrace();
} finally {
IOUtils.closeQuietly(ous);
}
}
@Override
@ -1306,9 +1303,7 @@ public class TradeLogServiceImpl implements TradeLogService {
}
List<JSONObject> clientOrderList = transactionMapper.getClientOrderByTransactionTime(params);
List<Integer> clientOrders = new ArrayList<>(clientOrderList.size());
clientOrderList.parallelStream().forEach(p->{
clientOrders.add(p.getInteger("clearing_order"));
});
clientOrderList.parallelStream().forEach(p -> clientOrders.add(p.getInteger("clearing_order")));
List<JSONObject> settlementLogDetailList = transactionMapper.getSettlementLogDetailList(clientOrders);
TimeZoneUtils.switchTimeZoneToString(settlementLogDetailList, timezone, "yyyy-MM-dd HH:mm:ss", Arrays.asList("transaction_time"));
try {
@ -1327,13 +1322,13 @@ public class TradeLogServiceImpl implements TradeLogService {
scaleDecimalVal(item, "settle_amount", platformCurrency);
scaleDecimalVal(item, "total_surcharge", platformCurrency);
scaleDecimalVal(item, "transaction_amount", platformCurrency);
item.put("exchange_rate", item.getBigDecimal("exchange_rate").setScale(5, BigDecimal.ROUND_DOWN));
item.put("exchange_rate", item.getBigDecimal("exchange_rate").setScale(5, RoundingMode.DOWN));
item.put("gateway", item.getInteger("gateway") == null ? "-" : TradeType.fromGatewayNumber(item.getIntValue("gateway")).getTradeType());
item.put("rate", item.getBigDecimal("rate") == null ? "-" : item.getBigDecimal("rate").toPlainString() + "%");
});
JRDataSource jrDataSource = new JRBeanCollectionDataSource(settlementLogDetailList);
response.setContentType("application/pdf");
String fileName = partner.getString("client_moniker") + "_" + parmerters.getString("dateRange").replaceAll("/", "");
String fileName = partner.getString("client_moniker") + "_" + parmerters.getString("dateRange").replace("/", "");
response.setHeader("Content-Disposition", "attachment;fileName=" + fileName + ".pdf");
OutputStream outs = response.getOutputStream();
byte[] bytes = JasperRunManager.runReportToPdf(partner_settlement_flow.getInputStream(), parmerters, jrDataSource);
@ -1348,19 +1343,20 @@ public class TradeLogServiceImpl implements TradeLogService {
@Override
public void exportExcelAllPartner(TradeLogQuery query, JSONObject partner, HttpServletResponse resp) throws Exception {
logger.debug("excel The method======= exportExcel() start.......................");
int client_id = partner.getIntValue("client_id");
int clientId1 = partner.getIntValue("client_id");
String timezone = partner.getJSONObject("client").getString("timezone");
JSONObject params = query.toParams(timezone);
clientManager.validateClients(client_id, params);
params.put("client_id", client_id);
clientManager.validateClients(clientId1, params);
params.put("client_id", clientId1);
List<JSONObject> logs = transactionMapper.listTransFlow(params);
TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy HH:mm:ss", Arrays.asList("transaction_time"));
if (logs.size() > 0) {
TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy HH:mm:ss", Collections.singletonList("transaction_time"));
TimeZoneUtils.switchTimeZoneToString(logs, TimeZone.getDefault().getID(), "dd/MM/yyyy", Collections.singletonList("clearing_time"));
if (!logs.isEmpty()) {
OutputStream ous = null;
String transType;
int status;
HSSFWorkbook wb = new HSSFWorkbook();
try (HSSFWorkbook wb = new HSSFWorkbook()) {
Font font = wb.createFont();
font.setBoldweight(Font.BOLDWEIGHT_BOLD);
font.setFontHeightInPoints((short) 10);
@ -1385,7 +1381,9 @@ public class TradeLogServiceImpl implements TradeLogService {
}
int rowNum = 0;
Row row = sheet.createRow(rowNum);
String[] title = {"Transaction Time", "Client Order ID", "System Order ID", "Client Moniker", "Short Name", "Order ID", "Channel", "Input Amount", "Transaction Amount", "Transaction Currency", "Clearing Amount", "Exchange Rate",
String[] title = {"Transaction Time", "Client Order ID", "System Order ID", "Client Moniker", "Short Name",
"Order ID", "Channel", "Input Amount", "Transaction Amount", "Transaction Currency", "Clearing Amount",
"Settle Amount", "Surcharge", "GST", "Settle Date", "Exchange Rate",
"Transaction Type", "Clearing Status", "Gateway", "Remark", "Dev No"};
for (int j = 0; j < title.length; j++) {
row.createCell(j, Cell.CELL_TYPE_STRING).setCellValue(title[j]);
@ -1414,12 +1412,21 @@ public class TradeLogServiceImpl implements TradeLogService {
scaleDecimalVal(log, "display_amount", platformCurrency);
scaleDecimalVal(log, "transaction_amount", platformCurrency);
scaleDecimalVal(log, "clearing_amount", platformCurrency);
scaleDecimalVal(log, "settle_amount", platformCurrency);
scaleDecimalVal(log, "total_surcharge", platformCurrency);
scaleDecimalVal(log, "tax_amount", platformCurrency);
row = sheet.createRow(++rowNum);
excelTrans(row, log);
}
} else {
List<JSONObject> logsByClientId = logs.stream().filter(log -> log.getString("client_id").equals(clientId)).collect(Collectors.toList());
for (JSONObject log : logsByClientId) {
scaleDecimalVal(log, "display_amount", platformCurrency);
scaleDecimalVal(log, "transaction_amount", platformCurrency);
scaleDecimalVal(log, "clearing_amount", platformCurrency);
scaleDecimalVal(log, "settle_amount", platformCurrency);
scaleDecimalVal(log, "total_surcharge", platformCurrency);
scaleDecimalVal(log, "tax_amount", platformCurrency);
row = sheet.createRow(++rowNum);
excelTrans(row, log);
}
@ -1438,3 +1445,4 @@ public class TradeLogServiceImpl implements TradeLogService {
}
}
}
}

1
src/main/ui/static/merchantapplication/merchant_application.js
Unescape View File

@ -783,6 +783,7 @@
}]);
app.controller('agreementSignDialogCtrl', ['$scope', '$http', 'commonDialog', function ($scope, $http, commonDialog) {
$scope.registering = true;
$scope.submitSign = function (fullName) {
var sign = $("#signature").jSignature('getData', 'image');
var signInfo = {};

2
src/main/ui/static/payment/partner/templates/agreement_signature_dialog.html
Unescape View File

@ -17,11 +17,13 @@
<div class="row dialog">
<div class="container-fluid">
<div class="" style="overflow-x: auto;">
<div ng-if="registering">
<span style="font-size: 150%">You are signing the agreement, and the merchant will be officially opened after you submit your signature</span>
<br/>
<span style="font-size: 150%">您正在签署协议，签名提交后正式开通商户。</span>
<br/>
<br/>
</div>
<span style="color:#f39c12;font-size: 150%;">（* Please sign here\请在此签名）</span>
<div id="signatureparent" class="sign">
<div id="signature" style="border:1px solid black;background-color: white; lineWidth:5; color: black "></div>

Write Preview
Loading…
Cancel
Save