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

---
 .../yythmall/api/lpkgoods/LpkGoodsQuery.java  |  1 +
 .../yythmall/biz/lpkgoods/LpkGoodsMapper.java |  2 ++
 .../yythmall/biz/lpkgoods/LpkGoodsMapper.xml  | 24 +++++++++++++++
 .../yythmall/biz/lpkgoods/LpkGoodsRest.java   |  6 ++++
 .../biz/lpkgoods/LpkGoodsService.java         | 30 ++++++++++++++-----
 .../yxt/yythmall/config/SaTokenConfigure.java |  1 +
 6 files changed, 56 insertions(+), 8 deletions(-)

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> {
     LpkGoods getGoodsByName(@Param("goodName") String goodName);
     List<GiftBagGoods> getAllGoodsApplet();
     List<MyGoodsVo> getGoodsApplet( @Param("query") LpkGoodsQuery query);
+    List<MyGoodsVo> getGoodsAppletInvalid( @Param("query") LpkGoodsQuery query);
+
     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 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
     </select>
+    <select id="getGoodsAppletInvalid" resultType="com.yxt.yythmall.api.appletgiftbag.MyGoodsVo">
+        SELECT
+            s.sid AS goodsSid,
+            date_format( s.createTime, '%Y-%m-%d' ) AS createTime,
+            s.`name`,
+            s.unitName,
+            s.price AS jPrice,
+            s.picUrl AS iconUrl,
+            s.specificationUnit,
+            s.isAppletGrounding,
+            s.content AS remark,
+            s.weight ,
+            r.goodsNumber as goodsNumber,
+            s.periodValidity
+        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
+    </select>
+
     <select id="getAllGoodsApplets" resultType="com.yxt.yythmall.api.appletgiftbag.GiftBagGoodss">
         select sid as goodsSid,
                date_format(createTime, '%Y-%m-%d') as createTime,
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 b33886a..487feb9 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java
+++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java
@@ -81,6 +81,12 @@ public class LpkGoodsRest {
     public ResultBean  vegeCellarList(@RequestBody LpkGoodsQuery query) {
         return lpkGoodsService.vegeCellarList(query);
     }
+    @ApiOperation("我的菜窖失效列表")
+    @PostMapping("/vegeCellarInvalidList")
+    public ResultBean  vegeCellarInvalidList(@RequestBody LpkGoodsQuery query) {
+        return lpkGoodsService.vegeCellarInvalidList(query);
+    }
+
     @ApiOperation("我的菜窖类别及数量")
     @PostMapping("/vegeCellarTypeList")
     public ResultBean  vegeCellarTypeList(@RequestBody LpkGoodsQuery query) {
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 143d7e1..bacd13e 100644
--- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java
+++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java
@@ -246,23 +246,35 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
         if(StringUtils.isBlank(query.getAffiliation())){
             return rb.setMsg("参数不全");
         }
+        SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+        query.setNow(sdf.format(new Date()));
         List<MyGoodsVo> vo =baseMapper.getGoodsApplet(query);
         vo.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());
-            SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
-            if(s.getPeriodValidity()!=null){
-                //1>2 1 、1<2 -1 、1=2 0
-                int k= DateUtil.parse(sdf.format(s.getPeriodValidity())) .compareTo(DateUtil.parse(sdf.format(new Date())));
-                if(k==-1){
-                    s.setState("1");
-                }
-            }
         });
         return rb.success().setData(vo);
     }
+    public ResultBean  vegeCellarInvalidList(LpkGoodsQuery query) {
+        ResultBean rb=new ResultBean().fail();
+        if(StringUtils.isBlank(query.getCustomerSid())){
+            return rb.setMsg("参数不全");
+        }
+        SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+        query.setNow(sdf.format(new Date()));
+        List<MyGoodsVo> vo =baseMapper.getGoodsAppletInvalid(query);
+        vo.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);
+    }
+
+
     public ResultBean  vegeCellarTypeList(LpkGoodsQuery query) {
         ResultBean rb=new ResultBean().fail();
         if(StringUtils.isBlank(query.getCustomerSid())){
@@ -273,6 +285,8 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
         for (BrandVo brandVo : list1) {
             GoodsTypeVo vo1=new GoodsTypeVo();
             query.setAffiliation(brandVo.getId());
+            SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+            query.setNow(sdf.format(new Date()));
             List<MyGoodsVo> myGoodsVos =baseMapper.getGoodsApplet(query);
             vo1.setName(brandVo.getBrandName());
             vo1.setId(brandVo.getId());
diff --git a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java
index ac8e9bb..81ba119 100644
--- a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java
+++ b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java
@@ -115,6 +115,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .excludePathPatterns("/customerinvoice/saveOrUpdate")
                 .excludePathPatterns("/invoicetype/listAll")
                 .excludePathPatterns("/invoicerecords/save")
+                .excludePathPatterns("/lpkgoods/vegeCellarInvalidList")
                 .excludePathPatterns("//wxapi/**")
         ;
     }