Browse Source

修复店铺查询异常

codingliang 7 months atrás
parent
commit
9685931a0f

+ 1 - 1
src/main/java/com/sqx/modules/goods/dao/GoodsShopDao.java

@@ -45,7 +45,7 @@ public interface GoodsShopDao extends BaseMapper<GoodsShop> {
 
     IPage<GoodsShop> selectSearch(Page<GoodsShop> pages, String impotr, Double lng, Double lat, String city);
 
-    IPage<GoodsShop> selectShop(Page<GoodsShop> pages, Integer screen, Integer shopTypeId, Double lng, Double lat, String city, String impotr,Long activityId);
+    IPage<GoodsShop> selectShop(@Param("pages") Page<GoodsShop> pages, @Param("screen") Integer screen, @Param("shopTypeId") Integer shopTypeId, @Param("lng") Double lng, @Param("lat") Double lat, @Param("city") String city, @Param("impotr") String impotr, @Param("activityId") Long activityId, @Param("vipPromotion") String vipPromotion);
 
     IPage<Evaluate> selectEvaluate(Page<Evaluate> pages, Long shopId, String goodsId, Integer grade);
 

+ 1 - 1
src/main/java/com/sqx/modules/goods/service/impl/GoodsServiceImpl.java

@@ -534,7 +534,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsDao, Goods> implements Go
             city = getCity(lat, lng);
         }
 
-        IPage<GoodsShop> goodsShopIPage = goodsShopDao.selectShop(pages, queryDTO.getScreen(), queryDTO.getShopTypeId(), lng, lat, city, queryDTO.getImpotr(), queryDTO.getActivityId());
+        IPage<GoodsShop> goodsShopIPage = goodsShopDao.selectShop(pages, queryDTO.getScreen(), queryDTO.getShopTypeId(), lng, lat, city, queryDTO.getImpotr(), queryDTO.getActivityId(), queryDTO.getVipPromotion());
         List<GoodsShop> records = goodsShopIPage.getRecords();
 
         if (CollUtil.isNotEmpty(records)) {