From e788b57684b616e386ca184a3890faa66adfc9ac Mon Sep 17 00:00:00 2001 From: wwb <782276617@qq.com> Date: Mon, 18 Nov 2024 09:04:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B7=9F=E5=8D=95=E5=91=98=E5=8F=91?= =?UTF-8?q?=E9=80=81=E9=82=AE=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/saleorder/SaleOrderServiceImpl.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java index 214b3eb..528615d 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java @@ -50,8 +50,10 @@ import cn.hangtag.module.oms.service.product.ProductPriceService; import cn.hangtag.module.oms.service.productinfo.ProductInfoService; import cn.hangtag.module.oms.service.salecontract.SaleContractService; import cn.hangtag.module.oms.service.saleordersku.SaleOrderSkuService; +import cn.hangtag.module.system.dal.dataobject.user.AdminUserDO; import cn.hangtag.module.system.mq.message.mail.MailSendMessage; import cn.hangtag.module.system.service.mail.MailSendService; +import cn.hangtag.module.system.service.user.AdminUserService; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; @@ -130,6 +132,9 @@ public class SaleOrderServiceImpl implements SaleOrderService { @Resource private MailSendService mailSendService; + @Resource + private AdminUserService adminUserService; + @Value("${oms.partyb}") private String partyb; @@ -372,6 +377,18 @@ public class SaleOrderServiceImpl implements SaleOrderService { message.setMail(emails); message.setTitle("OMS订单系统"); message.setContent("您好，您的订单："+saleOrder.getBillno()+"，已审核通过！"); + mailSendService.doSendMail(message); + } + + String orderFollowerUser = saleOrder.getOrderFollowerUser(); + if(StringUtils.isNotBlank(orderFollowerUser)){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(orderFollowerUser)); + String email = user.getEmail(); + MailSendMessage message = new MailSendMessage(); + message.setAccountId(1L); + message.setMail(email); + message.setTitle("OMS订单系统"); + message.setContent("您好，订单："+saleOrder.getBillno()+"，已审核通过！"); mailSendService.doSendMail(message,new File(pdfPath)); } } From ec149902556c937bbec1a29f1492444c43a15754 Mon Sep 17 00:00:00 2001 From: wwb <782276617@qq.com> Date: Mon, 18 Nov 2024 09:19:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hangtag-ui/hangtag-ui-admin/src/views/Login/Login.vue | 4 ++-- hangtag-ui/hangtag-ui-admin/src/views/Login/SocialLogin.vue | 4 ++-- hangtag-ui/hangtag-ui-front/src/views/Login/Login.vue | 4 ++-- hangtag-ui/hangtag-ui-front/src/views/Login/SocialLogin.vue | 4 ++-- .../hangtag-ui-front/src/views/Login/components/LoginForm.vue | 4 ++-- hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hangtag-ui/hangtag-ui-admin/src/views/Login/Login.vue b/hangtag-ui/hangtag-ui-admin/src/views/Login/Login.vue index 5d349ce..904394f 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/Login/Login.vue +++ b/hangtag-ui/hangtag-ui-admin/src/views/Login/Login.vue @@ -29,7 +29,7 @@
-
@@ -40,7 +40,7 @@
-
+
-->
-->
-->
-->