From 4daf1069a9e8ff925f3f789b2d9f89e08b3305ad Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Sat, 11 Jan 2025 17:32:28 +0800 Subject: [PATCH] 1 --- .../pjcloud/hard/service/impl/order/HardCarServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java index 8c355e1ee..34eb1739c 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java @@ -24,7 +24,6 @@ import com.bsd.pjcloud.hard.mapper.order.HardParentCarMapper; import com.bsd.pjcloud.hard.service.HardCarService; import com.bsd.pjcloud.supermarket.api.feign.RemoteSupermarketUnitSkuService; import com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -68,9 +67,11 @@ public class HardCarServiceImpl extends ServiceImpl resultList = BeanUtils.toBean(carList, HardCarVo.class); List productIds = resultList.stream().map(HardCarEntity::getProductId).distinct().filter(ObjectUtil::isNotEmpty).toList(); if (ObjectUtil.isNotEmpty(productIds)) { + // 食堂线上 if (ObjectUtil.equals(HardTypeEnum.CANTEEN, hardTypeEnum)) { } + // 超市线上、线下 if (ObjectUtil.equals(HardTypeEnum.SUPERMARKET, hardTypeEnum)) { List supList = supermarketUnitSkuService.getSupermarketUnits(productIds).getData(); for (HardCarVo v : resultList) {