From 8f464b28f54620465355bc7358e594b33bc31b82 Mon Sep 17 00:00:00 2001 From: wwb <782276617@qq.com> Date: Tue, 9 Dec 2025 09:25:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/saleorder/vo/SaleOrderRespVO.java | 3 +++ .../convert/saleorder/SaleOrderConvert.java | 3 ++- .../saleorder/SaleOrderServiceImpl.java | 18 ++++++++++++++++++ .../src/api/oms/saleorder/index.ts | 1 + .../src/views/oms/saleorder/detail/index.vue | 1 + .../src/api/oms/saleorder/index.ts | 1 + hangtag-ui/hangtag-ui-front/src/locales/en.ts | 1 + .../hangtag-ui-front/src/locales/zh-CN.ts | 1 + .../src/views/oms/saleorder/detail/index.vue | 1 + 9 files changed, 29 insertions(+), 1 deletion(-) diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java index b02bf7f..863e9da 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java @@ -65,6 +65,9 @@ public class SaleOrderRespVO { @ExcelProperty("总金额") private BigDecimal orderAmount; + @Schema(description = "物流单号") + @ExcelProperty("物流单号") + private String logisticsCode; @Schema(description = "业务日期") @ExcelProperty("业务日期") diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java index 70a1578..c02f468 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java @@ -35,7 +35,8 @@ public interface SaleOrderConvert { @Mapping(source = "brandId", target = "brandId"), @Mapping(source = "saleContractCode", target = "saleContractCode"), @Mapping(source = "totalQty", target = "totalQty"), - @Mapping(source = "orderAmount", target = "orderAmount") + @Mapping(source = "orderAmount", target = "orderAmount"), + @Mapping(source = "logisticsCode", target = "logisticsCode") }) SaleOrderRespVO convert(SaleOrderDO bean); 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 a375f39..3e5528f 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 @@ -862,6 +862,24 @@ public class SaleOrderServiceImpl implements SaleOrderService { mailSendService.doSendMail(message); } } + + String emails = order.getEmails(); + if (StringUtils.isNotBlank(emails) && customerDO != null) { + // 获取跟单员 给跟单员发邮件 + List emailList = FuncUtil.toStrList(";", emails); + for (String email : emailList) { + MailSendMessage message = new MailSendMessage(); + message.setAccountId(1L); + message.setMail(email); + //message.setMail("782276617@qq.com"); + message.setTitle("OMS订单系统"); + //StringBuffer content = new StringBuffer(); + //content.append("您好，客户：【" + customerDO.getName() + "】 来新的订单啦，订单号：" + order.getBillno() + "，下单时间：" + createTimestr + " 请进行处理！"); + String htmlcontent = generateMailSendHtmlContent(order, entryList); + message.setContent(htmlcontent); + mailSendService.doSendMail(message); + } + } return order.getId(); } diff --git a/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts b/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts index 836867d..39f00f5 100644 --- a/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts +++ b/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts @@ -20,6 +20,7 @@ export interface SaleOrderVO { contractType: string // 合约类型 currencyType: string // 结算币种 saleContractCode: string // 销售合约号 + logisticsCode: string // 销售合约号 totalQty: number // 总数量 totalAmount: number // 总金额 } diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue index 59e8adf..c0de0df 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue +++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/detail/index.vue @@ -79,6 +79,7 @@ {{ formData.currencyType }} {{ formData.totalQty }} {{ formData.orderAmount }} + {{ formData.logisticsCode }} {{ formData.remark }} diff --git a/hangtag-ui/hangtag-ui-front/src/api/oms/saleorder/index.ts b/hangtag-ui/hangtag-ui-front/src/api/oms/saleorder/index.ts index cbaea1a..e061b3d 100644 --- a/hangtag-ui/hangtag-ui-front/src/api/oms/saleorder/index.ts +++ b/hangtag-ui/hangtag-ui-front/src/api/oms/saleorder/index.ts @@ -16,6 +16,7 @@ export interface SaleOrderVO { address: string // 地址 currency: string // 货币 invoiceRemarks: string // 发票备注 + logisticsCode: string // 物流单号 totalQty: number // 总数量 totalAmount: number // 总金额 } diff --git a/hangtag-ui/hangtag-ui-front/src/locales/en.ts b/hangtag-ui/hangtag-ui-front/src/locales/en.ts index 8f28271..1d4faea 100644 --- a/hangtag-ui/hangtag-ui-front/src/locales/en.ts +++ b/hangtag-ui/hangtag-ui-front/src/locales/en.ts @@ -526,6 +526,7 @@ export default { }, billno:'orderNo', customer:'customer', + logisticsCode:'logisticsCode', brand:'brand', salesperson:'salesPerson', followUpPerson:'followUpPerson', diff --git a/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts b/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts index 8633027..558a3ca 100644 --- a/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts +++ b/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts @@ -521,6 +521,7 @@ export default { }, billno:'订单号', customer:'客户', + logisticsCode:'物流单号', brand:'品牌', salesperson:'销售员', followUpPerson:'跟单员', diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/detail/index.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/detail/index.vue index 350bd26..a3b71dd 100644 --- a/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/detail/index.vue +++ b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/detail/index.vue @@ -30,6 +30,7 @@ {{ formData.currencyType }} {{ formData.totalQty }} {{ formData.orderAmount }} + {{ formData.logisticsCode }} {{ formData.remark }}