From 2169734d6e7a409628f50d9f7491c76e7af0b3e1 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Wed, 26 Nov 2025 15:53:29 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=85=A8=E5=BA=97=E4=BC=98=E6=83=A0=E6=8A=A5=E9=94=99?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StoreCustomerProductDiscountServiceImpl.java | 8 +++++++- .../ruoyi/xkt/service/impl/StoreProductServiceImpl.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java index 1c132db0e..ee512cf13 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java @@ -11,11 +11,13 @@ import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.xkt.domain.StoreCustomer; import com.ruoyi.xkt.domain.StoreCustomerProductDiscount; +import com.ruoyi.xkt.domain.StoreProduct; import com.ruoyi.xkt.domain.StoreProductColor; import com.ruoyi.xkt.dto.storeCusProdDiscount.*; import com.ruoyi.xkt.mapper.StoreCustomerMapper; import com.ruoyi.xkt.mapper.StoreCustomerProductDiscountMapper; import com.ruoyi.xkt.mapper.StoreProductColorMapper; +import com.ruoyi.xkt.mapper.StoreProductMapper; import com.ruoyi.xkt.service.IStoreCustomerProductDiscountService; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; @@ -40,6 +42,7 @@ public class StoreCustomerProductDiscountServiceImpl implements IStoreCustomerPr final StoreCustomerProductDiscountMapper cusProdDiscMapper; final StoreCustomerMapper storeCusMapper; final StoreProductColorMapper storeProdColorMapper; + final StoreProductMapper storeProdMapper; /** * 修改档口客户优惠 @@ -72,10 +75,13 @@ public class StoreCustomerProductDiscountServiceImpl implements IStoreCustomerPr // 档口所有的商品 List storeProdColorList = this.storeProdColorMapper.selectList(new LambdaQueryWrapper() .eq(StoreProductColor::getStoreId, cusProdDisDTO.getStoreId()).eq(StoreProductColor::getDelFlag, Constants.UNDELETED)); + List storeProdList = this.storeProdMapper.selectByIds(storeProdColorList.stream().map(StoreProductColor::getStoreProdId).collect(Collectors.toList())); + Map prodArtNumMap = storeProdList.stream().collect(Collectors.toMap(StoreProduct::getId, StoreProduct::getProdArtNum)); // 绑定其它商品的优惠 List addDiscountList = storeProdColorList.stream().filter(x -> !existDiscountProdColorIdList.contains(x.getId())) .map(x -> BeanUtil.toBean(x, StoreCustomerProductDiscount.class).setDiscount(cusProdDisDTO.getAllProductDiscount()).setStoreProdColorId(x.getId()) - .setStoreId(cusProdDisDTO.getStoreId()).setStoreCusId(storeCus.getId()).setStoreCusName(cusProdDisDTO.getStoreCusName())) + .setStoreId(cusProdDisDTO.getStoreId()).setStoreCusId(storeCus.getId()).setStoreCusName(cusProdDisDTO.getStoreCusName()) + .setProdArtNum(prodArtNumMap.get(x.getStoreProdId()))) .collect(Collectors.toList()); // 档口所有商品优惠 if (CollectionUtils.isNotEmpty(addDiscountList)) { diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java index 3b15bf95d..af1e1aa6f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java @@ -1289,7 +1289,7 @@ public class StoreProductServiceImpl implements IStoreProductService { * @param mainPicUrl 商品主图URL */ private void updateUserBrowsingToRedis(Long storeProdId, Long storeId, String storeName, String prodArtNum, String prodTitle, BigDecimal minPrice, String mainPicUrl) { - final Long userId = SecurityUtils.getUserId(); + final Long userId = SecurityUtils.getUserIdSafe(); if (ObjectUtils.isEmpty(userId)) { return; }