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);