From 1399fb38a52c6702d07994dc76d701d5fff8f99e Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Fri, 1 Jun 2018 14:31:16 +0800 Subject: [PATCH 1/7] fixbug mail bug --- .../payment/manage/mappers/system/MailSendMapper.java | 3 +++ .../manage/system/core/impl/MailGunServiceImpl.java | 4 ++-- .../payment/manage/mappers/system/MailSendMapper.xml | 10 ++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.xml diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java index eb655766a..2926049bd 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java @@ -21,6 +21,9 @@ public interface MailSendMapper { @AutoSql(type = SqlType.UPDATE) void update(JSONObject record); + @AutoSql(type = SqlType.UPDATE) + void updateStatus(JSONObject record); + @AutoSql(type = SqlType.SELECT) JSONObject find(@Param("id") String id, @Param("mail_address")String mail_address); } diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java index 0676117cb..9c0915c38 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java @@ -59,7 +59,7 @@ public class MailGunServiceImpl implements MailGunService { record.put("id", tmpJSONObject.getString("id")); record.put("mail_address", mailAddress); record.put("status", 1); - mailSendMapper.update(record); + mailSendMapper.updateStatus(record); } } } @@ -78,7 +78,7 @@ public class MailGunServiceImpl implements MailGunService { record.put("id", tmpJSONObject.getString("id")); record.put("mail_address", mailAddress); record.put("status", 2); - mailSendMapper.update(record); + mailSendMapper.updateStatus(record); } } } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.xml new file mode 100644 index 000000000..c9a2dea57 --- /dev/null +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.xml @@ -0,0 +1,10 @@ + + + + + update sys_mail_send + set status = #{status} + where id = #{id} + and mail_address = #{mail_address} + + \ No newline at end of file From 0c5f5cb3928198831bf7a2581e46dd9aeeea6504 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Fri, 1 Jun 2018 14:34:53 +0800 Subject: [PATCH 2/7] fixbug mail bug --- .../payment/manage/system/web/MailCallBackController.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/system/web/MailCallBackController.java b/src/main/java/au/com/royalpay/payment/manage/system/web/MailCallBackController.java index 0452a7c8e..8075820f4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/web/MailCallBackController.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/web/MailCallBackController.java @@ -10,8 +10,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; @RestController @RequestMapping(value = "/mailgun") @@ -28,10 +26,8 @@ public class MailCallBackController { @RequestMapping(value = "/callback/dropped", method = RequestMethod.POST) - public void contractList(HttpServletRequest req, HttpServletResponse res) throws Exception { - logger.info("kira"+req.getRequestURL().toString()); -// logger.info("kira"+content); -// mailService.dealDroppedNotify(content); + public void contractList(@RequestBody String content) throws Exception { + mailService.dealDroppedNotify(content); } } \ No newline at end of file From 0bc2a07513fcddd1d41a57177841221aa77aefd4 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Fri, 1 Jun 2018 16:00:44 +0800 Subject: [PATCH 3/7] update --- .../notice/core/impls/NoticeManageImpl.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java index 84b15a597..1d0b720f7 100644 --- a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java @@ -28,7 +28,6 @@ import org.springframework.util.Assert; import java.io.IOException; import java.net.URISyntaxException; -import java.util.ArrayList; import java.util.Date; import java.util.HashSet; import java.util.List; @@ -129,8 +128,8 @@ public class NoticeManageImpl implements NoticeManage { return notice; } - @Transactional @Override + @Transactional public void updateNotice(JSONObject manager, String noticeId, NoticeInfo info) throws Exception { JSONObject noticeInfo = noticeManageMapper.getNoticeDetailById(noticeId); Assert.notNull(noticeInfo); @@ -144,7 +143,6 @@ public class NoticeManageImpl implements NoticeManage { } if (!notice.getBoolean("merchants_type")){ StringBuilder sendClients = new StringBuilder(); - List clients = clientMapper.listValidClient(); clients.forEach(c -> { if (c.getInteger("parent_client_id")==null || c.getInteger("parent_client_id")!=9){ @@ -154,22 +152,27 @@ public class NoticeManageImpl implements NoticeManage { }); if (sendClients.length()>0){ notice.put("send_clients",sendClients.substring(0,sendClients.length()-1)); - } + }else { + notice.put("send_clients",info.getSend_clients()); } noticeManageMapper.updateNotice(notice); + if (info.getStatus() != null && info.getSend_clients() != null) { if (info.getStatus().equals("1") && noticeInfo.getString("status").equals("0") && !info.getSend_clients().isEmpty()) { + String client_monikers []=info.getSend_clients().split(","); Set mailto = new HashSet<>(); - ArrayList mailboxs = new ArrayList<>(); - for (String clientMoniker : client_monikers) { - JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker); - String contact_email = client.getString("contact_email"); - if (contact_email!=null && !mailboxs.contains(contact_email)){ - mailto.add(contact_email); - mailboxs.add(contact_email); + if(notice.getBoolean("merchants_type")){ + for (String clientMoniker : client_monikers) { + JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker); + String contact_email = client.getString("contact_email"); + if (contact_email!=null){ + mailto.add(contact_email); + } } + }else { + mailto.add("merchants@mail.royalpay.com.au"); } if(info.isIs_tomail()){ //同时发送给股东 @@ -195,7 +198,6 @@ public class NoticeManageImpl implements NoticeManage { retailAppService.sendNoticeMessage(info,client_monikers); } } - } } From c971f2005c094e0af933141beb39beea868934eb Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Fri, 1 Jun 2018 16:05:17 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/manage/notice/core/impls/NoticeManageImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java index 1d0b720f7..cbebca63b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java @@ -172,7 +172,8 @@ public class NoticeManageImpl implements NoticeManage { } } }else { - mailto.add("merchants@mail.royalpay.com.au"); +// mailto.add("merchants@mail.royalpay.com.au"); + mailto.add("test@mail.royalpay.com.au"); } if(info.isIs_tomail()){ //同时发送给股东 From 50afd1207d826095668cf98378039a5c5e5cafb3 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Fri, 1 Jun 2018 17:00:21 +0800 Subject: [PATCH 5/7] rollback --- .../payment/manage/mappers/system/MailSendMapper.java | 2 +- .../payment/manage/notice/core/impls/NoticeManageImpl.java | 4 ++-- .../payment/manage/system/core/impl/MailGunServiceImpl.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java index 2926049bd..ad6e252f0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/MailSendMapper.java @@ -13,7 +13,7 @@ import cn.yixblog.support.mybatis.autosql.annotations.SqlType; /** * Create by yixian at 2017-12-13 19:10 */ -@AutoMapper(tablename = "sys_mail_send", pkName = "id") +@AutoMapper(tablename = "sys_mail_send", pkName = {"id", "mail_address"}) public interface MailSendMapper { @AutoSql(type = SqlType.INSERT) void save(JSONObject record); diff --git a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java index cbebca63b..f172e37f9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java @@ -172,8 +172,8 @@ public class NoticeManageImpl implements NoticeManage { } } }else { -// mailto.add("merchants@mail.royalpay.com.au"); - mailto.add("test@mail.royalpay.com.au"); + mailto.add("merchants@mail.royalpay.com.au"); +// mailto.add("test@mail.royalpay.com.au"); } if(info.isIs_tomail()){ //同时发送给股东 diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java index 9c0915c38..0676117cb 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java @@ -59,7 +59,7 @@ public class MailGunServiceImpl implements MailGunService { record.put("id", tmpJSONObject.getString("id")); record.put("mail_address", mailAddress); record.put("status", 1); - mailSendMapper.updateStatus(record); + mailSendMapper.update(record); } } } @@ -78,7 +78,7 @@ public class MailGunServiceImpl implements MailGunService { record.put("id", tmpJSONObject.getString("id")); record.put("mail_address", mailAddress); record.put("status", 2); - mailSendMapper.updateStatus(record); + mailSendMapper.update(record); } } } From 5e077000de055bcef73e5821d49019d92356ebbe Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Fri, 1 Jun 2018 17:25:24 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/impls/SimpleClientApplyServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java index 6a11ce2aa..399ad5b79 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java @@ -112,10 +112,10 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { @Override public void verifyRegisterSMSCode(String codeKey, String phoneNumber) { String rediskey = getRegisterClientRedisKey(phoneNumber); - String codeValue = stringRedisTemplate.boundValueOps(rediskey).get(); - if (codeValue == null || !codeValue.equals(codeKey)) { - throw new BadRequestException("Verification code has expired or is not correct"); - } +// String codeValue = stringRedisTemplate.boundValueOps(rediskey).get(); +// if (codeValue == null || !codeValue.equals(codeKey)) { +// throw new BadRequestException("Verification code has expired or is not correct"); +// } stringRedisTemplate.delete(rediskey); } From 280588a2f93ee779bbae132abb63304119eb4e11 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Fri, 1 Jun 2018 17:28:00 +0800 Subject: [PATCH 7/7] rollback --- .../core/impls/SimpleClientApplyServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java index 399ad5b79..6a11ce2aa 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java @@ -112,10 +112,10 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { @Override public void verifyRegisterSMSCode(String codeKey, String phoneNumber) { String rediskey = getRegisterClientRedisKey(phoneNumber); -// String codeValue = stringRedisTemplate.boundValueOps(rediskey).get(); -// if (codeValue == null || !codeValue.equals(codeKey)) { -// throw new BadRequestException("Verification code has expired or is not correct"); -// } + String codeValue = stringRedisTemplate.boundValueOps(rediskey).get(); + if (codeValue == null || !codeValue.equals(codeKey)) { + throw new BadRequestException("Verification code has expired or is not correct"); + } stringRedisTemplate.delete(rediskey); }