diff --git a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsQuery.java b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsQuery.java index d0685f2..33be869 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsQuery.java +++ b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsQuery.java @@ -16,4 +16,5 @@ public class LpkGoodsQuery implements Query { private String affiliation; private String brandId; private String periodValidity; + private String now; } 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 2f366e5..eba8097 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.java @@ -33,6 +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); + 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 6adf7bc..9903d1e 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml +++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml @@ -102,8 +102,32 @@ LEFT JOIN lpk_goods s ON s.sid = r.goodsSid WHERE r.customerSid =#{query.customerSid} and r.affiliation =#{query.affiliation} + and date_format(periodValidity,'%Y-%m-%d') >= date_format (#{query.now},'%Y-%m-%d') order by periodValidity desc + +