From 4a912fe4e7230a8801f22de0c2703b9786aeb2e4 Mon Sep 17 00:00:00 2001 From: huk Date: Sun, 28 Sep 2025 11:22:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E5=90=8D=E7=A7=B0=E5=88=B0=E8=AE=A2=E5=8D=95=E9=A1=B9?= =?UTF-8?q?-=20=E7=A7=BB=E9=99=A4=E4=BA=86=E6=9C=AA=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=9A=84LocalDateTimeUtil=E5=AF=BC=E5=85=A5=20-=20=E5=BC=95?= =?UTF-8?q?=E5=85=A5=E4=BA=86SysTenantService=E5=92=8CSysTenantVo=E4=BE=9D?= =?UTF-8?q?=E8=B5=96-=20=E5=9C=A8OrderServiceImpl=E4=B8=AD=E6=B3=A8?= =?UTF-8?q?=E5=85=A5=E4=BA=86ISysTenantService-=20=E4=B8=BA=E6=AF=8F?= =?UTF-8?q?=E4=B8=AA=E8=AE=A2=E5=8D=95=E9=A1=B9=E6=9F=A5=E8=AF=A2=E5=B9=B6?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=A7=9F=E6=88=B7=E5=90=8D=E7=A7=B0=20-=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E8=AE=A2=E5=8D=95=E9=A1=B9=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E9=80=BB=E8=BE=91=EF=BC=8C=E6=8F=90=E9=AB=98=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soopin/order/service/impl/OrderServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java index a8a4c4362..9f9652102 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java @@ -3,7 +3,6 @@ package com.wzj.soopin.order.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.text.StrBuilder; import cn.hutool.core.util.RandomUtil; @@ -48,7 +47,9 @@ import org.dromara.common.mq.utils.MqUtil; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.system.domain.SysTenant; +import org.dromara.system.domain.vo.SysTenantVo; import org.dromara.system.mapper.SysTenantMapper; +import org.dromara.system.service.ISysTenantService; import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeanUtils; import org.springframework.data.domain.PageImpl; @@ -97,6 +98,7 @@ public class OrderServiceImpl extends ServiceImpl implements * 订单前缀 */ private final static String ORDER_SN_PREFIX = "WZJ"; + private final ISysTenantService SysTenantService; /** @@ -249,7 +251,7 @@ public class OrderServiceImpl extends ServiceImpl implements orderMapper.insert(order); List orderItemList = skus.stream().map(sku -> { Product product = productMap.get(sku.getProductId()); - return OrderItem.builder() + OrderItem orderItem = OrderItem.builder() .orderId(order.getId()) .productId(sku.getProductId()) .productSnapshotId(product.getProductSnapshotId()) @@ -266,6 +268,11 @@ public class OrderServiceImpl extends ServiceImpl implements .tenantId(sku.getTenantId()) .shareMemberId(skuItemBOList.stream().filter(item -> item.getSkuId().equals(sku.getId())).findFirst().get().getShareMemberId()) .build(); + SysTenantVo tenant = SysTenantService.queryByTenantId(sku.getTenantId()); + if (tenant != null) { + orderItem.setTenantName(tenant.getStoreName()); + } + return orderItem; }).toList(); orderItemMapper.insert(orderItemList); return BeanUtil.copyProperties(order, OrderVO.class);