From b79e7f15a57a0661529e19496a3e72e257cf409d Mon Sep 17 00:00:00 2001
From: sj <1304317391@qq.com>
Date: Thu, 1 Dec 2022 15:26:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BE=9D=E8=B5=96=E5=BE=AA?=
 =?UTF-8?q?=E7=8E=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/YxStoreCombinationServiceImpl.java       | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
index fc0902ce..862f827f 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
@@ -46,6 +46,7 @@ import co.yixiang.modules.product.service.YxStoreProductService;
 import co.yixiang.modules.product.service.dto.FromatDetailDto;
 import co.yixiang.modules.product.service.dto.ProductFormatDto;
 import co.yixiang.modules.product.service.dto.ProductResultDto;
+import co.yixiang.modules.product.service.impl.YxStoreProductServiceImpl;
 import co.yixiang.modules.product.service.mapper.StoreProductMapper;
 import co.yixiang.modules.product.vo.YxStoreProductAttrQueryVo;
 import co.yixiang.modules.shop.service.YxSystemConfigService;
@@ -84,12 +85,11 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
     @Autowired
     private IGenerator generator;
 
-    @Autowired
-    private YxStoreProductService yxStoreProductService;
     @Autowired
     private YxStorePinkMapper yxStorePinkMapper;
     @Autowired
     private YxStoreVisitMapper yxStoreVisitMapper;
+
     @Autowired
     private RedisUtils redisUtils;
     @Autowired
@@ -105,8 +105,6 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
     @Autowired
     private YxShippingTemplatesService shippingTemplatesService;
 
-    @Autowired
-    private YxStoreProductService storeProductService;
     @Autowired
     private YxSystemConfigService systemConfigService;
 
@@ -243,7 +241,7 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
         List<YxStoreCombinationDto> combinationDTOS = generator.convert(page.getList(),YxStoreCombinationDto.class);
         for (YxStoreCombinationDto combinationDTO : combinationDTOS) {
             //这里把商品的售价放入到拼团的原价中，方便后台列表查看
-            YxStoreProduct yxStoreProduct=yxStoreProductService.getById(combinationDTO.getProductId());
+            YxStoreProduct yxStoreProduct=storeProductMapper.selectById(combinationDTO.getProductId());
             if (ObjectUtil.isNotEmpty(yxStoreProduct)){
                 combinationDTO.setProductPrice(yxStoreProduct.getPrice());
             };