From 21d751322250e6fac789d56fec68b357a2d44904 Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Mon, 20 Jan 2020 10:03:07 +0800 Subject: [PATCH 1/4] [R] fix --- .../royalpay/payment/manage/mappers/payment/OrderMapper.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml index ec38e8333..ab0a1eb47 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml @@ -530,10 +530,6 @@ o.channel=#{chan} - - AND - o.source != 'system' - AND o.source = #{source} From d8d371dbc1855ab974e07c486c36afccf3c9d4cd Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Mon, 20 Jan 2020 10:04:47 +0800 Subject: [PATCH 2/4] [R] fix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a43a0b33..5ff40f4a7 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.20 + 1.3.21 UTF-8 1.4.0 From 05e57f0592d73fd89c4c3cad06ff4d2de3b3adba Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Mon, 20 Jan 2020 14:30:45 +0800 Subject: [PATCH 3/4] update --- .../core/impls/ClientManagerImpl.java | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index be0ac7793..5298c79c0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -369,31 +369,35 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (manager != null) { checkClientOrg(manager, client); } - String same_phone = clientMapper.findSamePhone(client.getString("contact_phone")).getString("a"); - if (same_phone != null && client.getString("contact_phone") != null && same_phone.contains(" ")) { - same_phone = same_phone.replace(client.getString("client_moniker"), ""); - client.put("same_phone", "（雷同商户：" + same_phone + ")"); - } + // 雷同信息检查 + try { + String same_phone = clientMapper.findSamePhone(client.getString("contact_phone")).getString("a"); + if (same_phone != null && client.getString("contact_phone") != null && same_phone.contains(" ")) { + same_phone = same_phone.replace(client.getString("client_moniker"), ""); + client.put("same_phone", "（雷同商户：" + same_phone + ")"); + } - String same_company_name = clientMapper.findSameCompanyName(client.getString("company_name")).getString("a"); - if (same_company_name != null && client.getString("company_name") != null && same_company_name.contains(" ")) { - same_company_name = same_company_name.replace(client.getString("client_moniker"), ""); - client.put("same_company_name", "（雷同商户：" + same_company_name + ")"); - } + String same_company_name = clientMapper.findSameCompanyName(client.getString("company_name")).getString("a"); + if (same_company_name != null && client.getString("company_name") != null && same_company_name.contains(" ")) { + same_company_name = same_company_name.replace(client.getString("client_moniker"), ""); + client.put("same_company_name", "（雷同商户：" + same_company_name + ")"); + } - String same_email = clientMapper.findSameEmail(client.getString("contact_email")).getString("a"); - if (same_email != null && client.getString("contact_email") != null && same_email.contains(" ")) { - same_email = same_email.replace(client.getString("client_moniker"), ""); - client.put("same_email", "（雷同商户：" + same_email + ")"); - } + String same_email = clientMapper.findSameEmail(client.getString("contact_email")).getString("a"); + if (same_email != null && client.getString("contact_email") != null && same_email.contains(" ")) { + same_email = same_email.replace(client.getString("client_moniker"), ""); + client.put("same_email", "（雷同商户：" + same_email + ")"); + } - String same_address = clientMapper.findSameAddress(client.getString("address")).getString("a"); - if (same_address != null && client.getString("address") != null && same_address.contains(" ")) { - same_address = same_address.replace(client.getString("client_moniker"), ""); - client.put("same_address", "（雷同商户：" + same_address + ")"); + String same_address = clientMapper.findSameAddress(client.getString("address")).getString("a"); + if (same_address != null && client.getString("address") != null && same_address.contains(" ")) { + same_address = same_address.replace(client.getString("client_moniker"), ""); + client.put("same_address", "（雷同商户：" + same_address + ")"); + } + } catch (Exception e) { + // donothing } - client.putAll(clientConfigService.find(client.getIntValue("client_id"))); client.put("unsubscribe", mailUnsubMapper.findOneByClientMoniker(clientMoniker) == null ? false : true); client.put("show_all_permission", true); From 86a754451cd397a0e70e09f911fe6c9363ecb994 Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Thu, 23 Jan 2020 14:26:19 +0800 Subject: [PATCH 4/4] remove alipay loginid --- .../core/impls/TradeLogServiceImpl.java | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java index 15bdf7b21..7b0daf23f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java @@ -43,7 +43,6 @@ import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter; import net.sf.jasperreports.export.*; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVPrinter; -import org.apache.commons.csv.QuoteMode; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; @@ -62,7 +61,10 @@ import org.springframework.ui.Model; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintWriter; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.DateFormat; @@ -545,16 +547,6 @@ public class TradeLogServiceImpl implements TradeLogService { clientManager.validateClients(clientId, params); params.put("client_id", clientId); List logs = transactionMapper.listTransFlow(params); - 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", Collections.singletonList("transaction_time")); TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy", Collections.singletonList("clearing_time")); @@ -1716,12 +1708,7 @@ public class TradeLogServiceImpl implements TradeLogService { } if ("ALL".equals(clientId)) { for (JSONObject log : logs) { - String login_id = log.getString("login_id"); - if (StringUtils.isNotEmpty(login_id)) { - log.put("order_detail", (StringUtils.isEmpty(log.getString("order_detail")) ? "" : login_id + ":" + log.getString("order_detail"))); - } else { - log.put("order_detail", (StringUtils.isEmpty(log.getString("order_detail")) ? "" : log.getString("order_detail"))); - } + log.put("order_detail", (StringUtils.isEmpty(log.getString("order_detail")) ? "" : log.getString("order_detail"))); transType = log.getString("trans_type"); if ("refund".equals(transType)) { status = log.getIntValue("status");