From 0fe49dfd8ed60cfbe2c8f14b5a2b2cda4fff66ab Mon Sep 17 00:00:00 2001 From: dy-hu Date: Wed, 19 Jun 2024 20:30:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=95=86=E5=93=81=E9=80=89=E6=8B=A9=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=95=86=E5=93=81=E6=90=9C=E7=B4=A2=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/cereshop/business/dao/tool/CereShopCouponDAO.java | 3 ++- .../com/shop/cereshop/business/page/tool/ToolProduct.java | 6 ++++++ .../cereshop/business/param/tool/ToolProductNewParam.java | 2 ++ .../service/tool/impl/CereShopCouponServiceImpl.java | 14 ++++++++++++-- .../resources/mybatis/mapper/tool/CereShopCouponDAO.xml | 6 ++++++ 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopCouponDAO.java b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopCouponDAO.java index 3f7012f..0a4a7a3 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopCouponDAO.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/dao/tool/CereShopCouponDAO.java @@ -76,7 +76,8 @@ public interface CereShopCouponDAO extends BaseMapper { List getProductsNew(@Param("businessId") Long businessId, @Param("shopCouponId") Long shopCouponId, - @Param("queryType") Integer queryType); + @Param("queryType") Integer queryType, + @Param("searchContent") String searchContent); List getShops(@Param("businessId") Long businessId); } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ToolProduct.java b/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ToolProduct.java index 5f8d669..5d5dad9 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ToolProduct.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/page/tool/ToolProduct.java @@ -22,6 +22,12 @@ public class ToolProduct { private Long shopId; /** + * 店铺名称 + */ + @ApiModelProperty(value = "店铺名称") + private String shopName; + + /** * 商品id */ @ApiModelProperty(value = "商品id") diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/tool/ToolProductNewParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/tool/ToolProductNewParam.java index d1312f4..8dc4408 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/param/tool/ToolProductNewParam.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/tool/ToolProductNewParam.java @@ -37,5 +37,7 @@ public class ToolProductNewParam extends PageParam { @ApiModelProperty(value = "查询类型") private Integer queryType; + @ApiModelProperty(value = "商品查询内容") + private String searchContent; } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopCouponServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopCouponServiceImpl.java index db47034..743a484 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopCouponServiceImpl.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/tool/impl/CereShopCouponServiceImpl.java @@ -417,7 +417,17 @@ public class CereShopCouponServiceImpl implements CereShopCouponService { @Override public Page getProducts(ToolProductNewParam param) throws CoBusinessException { PageHelper.startPage(param.getPage(),param.getPageSize()); - List list=cereShopCouponDAO.getProductsNew(param.getBusinessId(), param.getActivityId(), param.getQueryType()); + List list=cereShopCouponDAO.getProductsNew(param.getBusinessId(), param.getActivityId(), param.getQueryType(), param.getSearchContent()); + list.forEach(prod -> { + try { + CerePlatformShop platformShop = platformShopService.getById(prod.getShopId()); + if (ObjectUtils.isNotEmpty(platformShop)){ + prod.setShopName(platformShop.getShopName()); + } + } catch (CoBusinessException e) { + e.printStackTrace(); + } + }); PageInfo pageInfo=new PageInfo<>(list); Page page=new Page(pageInfo.getList(),pageInfo.getTotal()); return page; @@ -556,7 +566,7 @@ public class CereShopCouponServiceImpl implements CereShopCouponService { List list; if (ObjectUtils.isNotEmpty(param.getActivityId())){ //查看店铺，获取全部已设置优惠券的商品，过滤商品的店铺id，去获取店铺信息 - List prodList = cereShopCouponDAO.getProductsNew(param.getBusinessId(), param.getActivityId(), param.getQueryType()); + List prodList = cereShopCouponDAO.getProductsNew(param.getBusinessId(), param.getActivityId(), param.getQueryType(), null); //去重获取店铺id List shopIds = prodList.stream().map(ToolProduct::getShopId).distinct().collect(Collectors.toList()); list = platformShopService.getByIdList(shopIds); diff --git a/cereshop-business/src/main/resources/mybatis/mapper/tool/CereShopCouponDAO.xml b/cereshop-business/src/main/resources/mybatis/mapper/tool/CereShopCouponDAO.xml index ab1fd31..0cec1c9 100644 --- a/cereshop-business/src/main/resources/mybatis/mapper/tool/CereShopCouponDAO.xml +++ b/cereshop-business/src/main/resources/mybatis/mapper/tool/CereShopCouponDAO.xml @@ -224,6 +224,12 @@ and csce.shop_coupon_id = #{shopCouponId} + + and csce.shop_coupon_id = #{shopCouponId} + + + and a.product_name like concat('%',#{searchContent},'%') +