商品模块与店铺模块交接处以query wrapper衔接存在问题，改用普通参数

framework/src/main/java/cn/lili/modules/goods/entity/dto/SimpleCommodity.java

@@ -1,18 +0,0 @@
-package cn.lili.modules.goods.entity.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 用于直播间前台使用的直播间商品DTO
- *
- * @author Bulbasaur
- * @since 2021/5/20 2:34 下午
- */
-public class SimpleCommodity {
-
-    @ApiModelProperty(value = "图片")
-    private String goodsImage;
-
-    @ApiModelProperty(value = "商品名称")
-    private String name;
-}

framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java

@@ -6,7 +6,6 @@ import cn.lili.modules.goods.entity.dto.GoodsSearchParams;
 import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
 import cn.lili.modules.goods.entity.vos.GoodsVO;
-import cn.lili.modules.member.entity.dto.CollectionDTO;
 import cn.lili.modules.store.entity.dos.Store;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -141,5 +140,10 @@ public interface GoodsService extends IService<Goods> {
      * @param store
      */
     void updateStoreDetail(Store store);
+    /**
+     * 统计店铺的商品数量
+     * @param storeId 店铺id
+     */
+    Integer countStoreGoodsNum(String storeId);
 
 }

framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java

@@ -379,6 +379,15 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         goodsSkuService.update(updateWrapper);
     }
 
+    @Override
+    public Integer countStoreGoodsNum(String storeId) {
+        return this.count(
+                new LambdaQueryWrapper<Goods>()
+                        .eq(Goods::getStoreId, storeId)
+                        .eq(Goods::getIsAuth, GoodsAuthEnum.PASS.name())
+                        .eq(Goods::getMarketEnable, GoodsStatusEnum.UPPER.name()));
+    }
+
     /**
      * 添加商品默认图片
      *

framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java

@@ -1,7 +1,6 @@
 package cn.lili.modules.store.serviceimpl;
 
 import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
@@ -9,15 +8,10 @@ import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.vo.PageVO;
-import cn.lili.modules.goods.entity.dos.Goods;
-import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
-import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
 import cn.lili.modules.goods.service.GoodsService;
-import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dto.CollectionDTO;
 import cn.lili.modules.member.service.MemberService;
-import cn.lili.modules.member.service.StoreCollectionService;
 import cn.lili.modules.store.entity.dos.Store;
 import cn.lili.modules.store.entity.dos.StoreDetail;
 import cn.lili.modules.store.entity.dto.*;
@@ -275,10 +269,7 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
     @Override
     public void updateStoreGoodsNum(String storeId) {
         //获取店铺已上架已审核通过商品数量
-        Integer goodsNum = goodsService.count(new LambdaQueryWrapper<Goods>()
+        Integer goodsNum = goodsService.countStoreGoodsNum(storeId);
-                .eq(Goods::getStoreId, storeId)
-                .eq(Goods::getIsAuth, GoodsAuthEnum.PASS.name())
-                .eq(Goods::getMarketEnable, GoodsStatusEnum.UPPER.name()));
         //修改店铺商品数量
         this.update(new LambdaUpdateWrapper<Store>()
                 .set(Store::getGoodsNum, goodsNum)