diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java index 7cfcb683d..6108d635f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java @@ -69,20 +69,22 @@ public class HomeController extends BaseController { @Autowired private MqBaseProducer mqBaseProducer; - @ApiOperation("发送邮件") - @GetMapping("test") - public ResultData test() throws Exception { - String msg = "富茂审批邮件审批通过通知编号123231232323的合同已经审批通过,请登录,长融后台跟进后续工作"; - MailMsg mailMsg = new MailMsg(); - mailMsg.setHtml(true); - mailMsg.setFrom("luozukai1988@126.com"); - mailMsg.setTo(new String[]{"luozukai@iformall.com"}); - mailMsg.setSubject("富茂测试邮件"); - mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); - mailMsg.setMsg(msg); - mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); - return new ResultData(); - } +// @ApiOperation("发送邮件") +// @GetMapping("test") +// public ResultData test() throws Exception { +// String msg = "富茂审批邮件\n" + +// "
\n" + +// "
审批通过通知
编号123231232323的合同已经审批通过,请登录,长融后台跟进后续工作
"; +// MailMsg mailMsg = new MailMsg(); +// mailMsg.setHtml(true); +// mailMsg.setFrom("luozukai1988@126.com"); +// mailMsg.setTo(new String[]{"luozukai@iformall.com"}); +// mailMsg.setSubject("富茂测试邮件"); +// mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); +// mailMsg.setMsg(msg); +// mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); +// return new ResultData(); +// } @GetMapping("/captcha.jpg") public void captcha(HttpServletResponse response)throws ServletException, IOException { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index d9cb09b63..2ed6b9bf5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -19,6 +19,9 @@ public class WxCoupon implements Serializable { @Transient protected List ids; + + @Transient + protected List notinTypes; @Transient protected String sortColumns; @@ -662,4 +665,12 @@ public class WxCoupon implements Serializable { public void setXtime(String xtime) { this.xtime = xtime; } + + public List getNotinTypes() { + return notinTypes; + } + + public void setNotinTypes(List notinTypes) { + this.notinTypes = notinTypes; + } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 6e76a1fef..cba7d3ab6 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -183,6 +183,13 @@ #{idItem} + + and type not in + + #{typeItem} + + + order by ${sortColumns}