diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.java b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.java index eba8097..b6d394c 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.java @@ -33,7 +33,8 @@ public interface LpkGoodsMapper extends BaseMapper { LpkGoods getGoodsByName(@Param("goodName") String goodName); List getAllGoodsApplet(); List getGoodsApplet( @Param("query") LpkGoodsQuery query); - List getGoodsAppletInvalid( @Param("query") LpkGoodsQuery query); + + IPage getGoodsAppletInvalid(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List getAllGoodsApplets(@Param("query") LpkGiftCardQuery query); List getType(); diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml index 9903d1e..29ae673 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml +++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml @@ -122,10 +122,9 @@ FROM vegetable_cellar r LEFT JOIN lpk_goods s ON s.sid = r.goodsSid - WHERE - r.customerSid =#{query.customerSid} - and date_format(periodValidity,'%Y-%m-%d') < date_format (#{query.now},'%Y-%m-%d') - order by periodValidity desc + + ${ew.sqlSegment} +