From 6c1b0d0826b67d02e1ee24c0672f501f9ad6a59c Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 16 Jul 2019 14:00:04 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8Ddashboard=20lakala?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BB=A5=E5=8F=8A=E5=8F=96=E6=B6=88pine?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/impls/ClientManagerImpl.java | 20 +------------------ .../CustomerAndOrdersStatisticsMapper.xml | 2 +- 2 files changed, 2 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 cace7252a..50beb1e9b 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 @@ -4799,7 +4799,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } @Override - @Transactional public void updateAllPartnerPassword(String clientMoniker) { JSONObject client = getClientInfoByMoniker(clientMoniker); if (client == null) { @@ -5095,20 +5094,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid private void sendTestMerchantPassword(List accounts) { List royalPayUsers = managerMapper.listRoyalPayUsers(); royalPayUsers = royalPayUsers.stream().filter(rpUser -> StringUtils.isNotEmpty(rpUser.getString("email"))).collect(Collectors.toList()); - String needSendEmails = royalPayUsers.stream().filter(user -> StringUtils.isNotEmpty(user.getString("email"))).map(user -> - user.getString("email") - ).collect(Collectors.joining(",")); - Context ctx = new Context(); - ctx.setVariable("accounts", accounts); - final String content = thymeleaf.process("mail/test_merchant_password", ctx); - new Thread(() -> { - try { - mailService.sendEmailWhihBcc("测试商户账户已更新", "info@royalpay.com.au", needSendEmails, content); - } catch (Exception e) { - logger.error("邮件发送失败", e); - } - }).start(); - List needNotifyUsers = royalPayUsers.stream().filter(user -> StringUtils.isNotEmpty(user.getString("wx_openid"))).map(user -> user.getString("wx_openid")).collect(Collectors.toList()); List sendAccounts = new ArrayList<>(); needNotifyUsers.forEach(userOpenId -> { @@ -5125,14 +5110,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid MpWechatApi paymentApi = mpWechatApiProvider.getNewPaymentApi(); TemplateMessage msg = initSendTestPasswordTemplate(userOpenId, paymentApi.getTemplateId("test-merchant-password"), signStr.replace("+", "%2B")); paymentApi.sendTemplateMessage(msg); - } catch (WechatException e) { - logger.error("给{}发送微信消息失败，原因：{}", userOpenId, e.getMessage()); } catch (Exception e) { - logger.error("给{}发送密码重置消息失败,原因: {}", userOpenId, e.getMessage()); + logger.error("给{}发送微信消息失败，原因：{}", userOpenId, e); } }); } - private TemplateMessage initSendTestPasswordTemplate(String wxopenid, String templateId, String url) { TemplateMessage msg = new TemplateMessage(wxopenid, templateId, PlatformEnvironment.getEnv().concatUrl("testMerchantPassword" + url)); msg.put("first", "系统测试商户账户已重置", "#000000"); diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml index ca9b3d988..ea7811073 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml @@ -338,7 +338,7 @@ ifnull(sum(CASE WHEN s.channel = 'Yeepay' THEN s.orders ELSE 0 END),0) yeepay_order_count, ifnull(COUNT(DISTINCT s.client_id,IF(s.channel = 'Yeepay',TRUE,NULL)),0) yeepay_client_count, ifnull(sum(CASE WHEN s.channel = 'LakalaPay' THEN s.total ELSE 0 END),0) lakalapayamount, - ifnull(sum(CASE WHEN s.channel = 'LakalaPay' THEN s.orders ELSE 0 END),0) lakala_order_count, + ifnull(sum(CASE WHEN s.channel = 'LakalaPay' THEN s.orders ELSE 0 END),0) lakalapay_order_count, ifnull(COUNT(DISTINCT s.client_id,IF(s.channel = 'LakalaPay',TRUE,NULL)),0) lakala_client_count, ifnull(sum(s.orders), 0) all_count, ifnull(sum(s.total), 0) all_amount,