From aab064210dda118011f6194bfb9737eeb2a048be Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 16 Apr 2024 11:15:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B1=E6=95=88=E5=88=97=E8=A1=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yythmall/biz/lpkgoods/LpkGoodsMapper.java  |  3 ++-
 .../yythmall/biz/lpkgoods/LpkGoodsMapper.xml   |  7 +++----
 .../yythmall/biz/lpkgoods/LpkGoodsRest.java    |  5 +++--
 .../yythmall/biz/lpkgoods/LpkGoodsService.java | 18 ++++++++++++++----
 4 files changed, 22 insertions(+), 11 deletions(-)

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> {
     LpkGoods getGoodsByName(@Param("goodName") String goodName);
     List<GiftBagGoods> getAllGoodsApplet();
     List<MyGoodsVo> getGoodsApplet( @Param("query") LpkGoodsQuery query);
-    List<MyGoodsVo> getGoodsAppletInvalid( @Param("query") LpkGoodsQuery query);
+
+    IPage<MyGoodsVo> getGoodsAppletInvalid(IPage<LpkGoods> page, @Param(Constants.WRAPPER) QueryWrapper<LpkGoods> qw);
 
     List<GiftBagGoodss> getAllGoodsApplets(@Param("query") LpkGiftCardQuery query);
     List<GoodsTypeVo> 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') &lt; date_format (#{query.now},'%Y-%m-%d')
-        order by periodValidity desc
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="getAllGoodsApplets" resultType="com.yxt.yythmall.api.appletgiftbag.GiftBagGoodss">
diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java
index 487feb9..28a2fc3 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java
+++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java
@@ -3,6 +3,7 @@ package com.yxt.yythmall.biz.lpkgoods;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.yythmall.api.appletgiftbag.MyGoodsVo;
 import com.yxt.yythmall.api.lpkgiftcard.LpkGiftCardQuery;
 import com.yxt.yythmall.api.lpkgoods.*;
 import io.swagger.annotations.Api;
@@ -83,8 +84,8 @@ public class LpkGoodsRest {
     }
     @ApiOperation("我的菜窖失效列表")
     @PostMapping("/vegeCellarInvalidList")
-    public ResultBean  vegeCellarInvalidList(@RequestBody LpkGoodsQuery query) {
-        return lpkGoodsService.vegeCellarInvalidList(query);
+    public ResultBean<PagerVo<MyGoodsVo>>  vegeCellarInvalidList(@RequestBody PagerQuery<LpkGoodsQuery> pq) {
+        return lpkGoodsService.vegeCellarInvalidList(pq);
     }
 
     @ApiOperation("我的菜窖类别及数量")
diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java
index bacd13e..19c88b0 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java
+++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java
@@ -257,21 +257,31 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
         });
         return rb.success().setData(vo);
     }
-    public ResultBean  vegeCellarInvalidList(LpkGoodsQuery query) {
+    public ResultBean<PagerVo<MyGoodsVo>>  vegeCellarInvalidList(PagerQuery<LpkGoodsQuery> pq) {
         ResultBean rb=new ResultBean().fail();
+        LpkGoodsQuery query = pq.getParams();
         if(StringUtils.isBlank(query.getCustomerSid())){
             return rb.setMsg("参数不全");
         }
+        QueryWrapper<LpkGoods> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getCustomerSid())) {
+            qw.eq("r.customerSid", query.getCustomerSid());
+        }
         SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
         query.setNow(sdf.format(new Date()));
-        List<MyGoodsVo> vo =baseMapper.getGoodsAppletInvalid(query);
-        vo.forEach(s->{
+        qw.apply(" date_format(s.periodValidity,'%Y-%m-%d') < date_format ('"+sdf.format(new Date())+"','%Y-%m-%d')");
+        qw.orderByDesc("s.periodValidity");
+        IPage<LpkGoods> page = PagerUtil.queryToPage(pq);
+        IPage<MyGoodsVo> pagging = baseMapper.getGoodsAppletInvalid(page, qw);
+        PagerVo<LpkGoodsVo> p = PagerUtil.pageToVo(pagging, null);
+        List<MyGoodsVo> records = pagging.getRecords();
+        records.forEach(s->{
             double i=Double.valueOf(s.getGoodsNumber());
             s.setGoodsNumber(DoubleUtils.removeZeros(String.valueOf((int)i)));
             s.setWeight(DoubleUtils.removeZeros(s.getWeight()));
             s.setIconUrl(fileUploadComponent.getUrlPrefix()+s.getIconUrl());
         });
-        return rb.success().setData(vo);
+        return rb.success().setData(p);
     }