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 8e7ed0f..b71fbb9 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 @@ -759,6 +759,24 @@ public class SaleOrderServiceImpl implements SaleOrderService { skuOrderSkuMapper.insertBatch(skuList); updateCustomerInvoiceData(order); + + //发送下单邮件 + Long customerId = order.getCustomerId(); + CustomerDO customerDO = customerMapper.selectById(customerId); + String orderFollowerUser = order.getOrderFollowerUser(); + if (StringUtils.isNotBlank(orderFollowerUser) && customerDO!=null) { + AdminUserDO user = adminUserService.getUser(Long.valueOf("143")); + String email = user.getEmail(); + MailSendMessage message = new MailSendMessage(); + message.setAccountId(1L); + message.setMail(email); + message.setTitle("OMS订单系统"); + StringBuffer content = new StringBuffer(); + content.append("您好,客户:"+customerDO.getName()+" 来新的订单啦,订单号:" + order.getBillno() + ",下单时间:"+DateUtil.date().toString()+" 请进行处理!"); + message.setContent(content.toString()); + mailSendService.doSendMail(message); + } + return order.getId(); } diff --git a/hangtag-server/src/main/resources/application-local.yaml b/hangtag-server/src/main/resources/application-local.yaml index d5e5843..7a2c38e 100644 --- a/hangtag-server/src/main/resources/application-local.yaml +++ b/hangtag-server/src/main/resources/application-local.yaml @@ -47,9 +47,9 @@ spring: primary: master datasource: master: - url: jdbc:mysql://202.74.40.60:33061/oms-uat?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://127.0.0.1:3306/hangtag-uat?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 username: root - password: qygo5gYNhivG + password: 123456 # slave: # 模拟从库,可根据自己需要修改 # lazy: true # 开启懒加载,保证启动速度 # url: jdbc:mysql://43.136.71.164:3306/hangtag?allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useUnicode=true&characterEncoding=UTF-8 diff --git a/hangtag-ui/hangtag-ui-admin/src/locales/zh-CN.ts b/hangtag-ui/hangtag-ui-admin/src/locales/zh-CN.ts index 1b93a88..0069a71 100644 --- a/hangtag-ui/hangtag-ui-admin/src/locales/zh-CN.ts +++ b/hangtag-ui/hangtag-ui-admin/src/locales/zh-CN.ts @@ -208,7 +208,7 @@ export default { toDo: '待办', introduction: '一个正经的简介', shortcutOperation: '快捷入口', - operationData: '运营数据', + operationData: '待处理任务', operation: '操作', index: '指数', personal: '个人', diff --git a/hangtag-ui/hangtag-ui-admin/src/views/Home/Index.vue b/hangtag-ui/hangtag-ui-admin/src/views/Home/Index.vue index 649f7f1..7aec719 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/Home/Index.vue +++ b/hangtag-ui/hangtag-ui-admin/src/views/Home/Index.vue @@ -56,7 +56,7 @@ - + diff --git a/hangtag-ui/hangtag-ui-admin/src/views/Home/components/OperationDataCard.vue b/hangtag-ui/hangtag-ui-admin/src/views/Home/components/OperationDataCard.vue index 10ebe0d..8977d9e 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/Home/components/OperationDataCard.vue +++ b/hangtag-ui/hangtag-ui-admin/src/views/Home/components/OperationDataCard.vue @@ -1,7 +1,7 @@