商品提货有效期，手机号

src/main/java/com/yxt/yythmall/api/appletgiftbag/GiftBagGoodss.java

@@ -2,8 +2,11 @@ package com.yxt.yythmall.api.appletgiftbag;
 
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author wangpengfei
  * @date 2024/1/16 12:07
@@ -27,6 +30,9 @@ public class GiftBagGoodss {
     private String count="0"; //总价值
     private String mefenPrice="0";
     private boolean showCart=false;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date periodValidity;
+    private String state="0";
 
 
 

src/main/java/com/yxt/yythmall/api/appletgiftbag/MyGoodsVo.java

@@ -1,7 +1,10 @@
 package com.yxt.yythmall.api.appletgiftbag;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author wangpengfei
  * @date 2024/1/18 8:50
@@ -19,7 +22,7 @@ public class MyGoodsVo {
     private String specificationUnit; //规格单位
     private String unitName; //份
     private String count="0";
-
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-
+    private Date periodValidity;
-
+    private String state="0";//商品过期状态  0未过期 1已过期
 }

src/main/java/com/yxt/yythmall/api/lpkgiftcard/LpkGiftCardQuery.java

@@ -17,4 +17,5 @@ public class LpkGiftCardQuery implements Query {
     private String affiliation;
     private String brandId;
     private String categoryId;
+    private String periodValidity;
 }

src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoods.java

@@ -46,4 +46,5 @@ public class LpkGoods {
     private String stepWeight;
     @ApiModelProperty("阶梯价格")
     private String stepPrice;
+    private String periodValidity;
 }

src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java

@@ -38,4 +38,5 @@ public class LpkGoodsDetailsVo implements Vo {
     private String stepWeight;
     @ApiModelProperty("阶梯价格")
     private String stepPrice;
+    private String periodValidity;
 }

src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDto.java

@@ -37,4 +37,5 @@ public class LpkGoodsDto implements Dto {
     private String stepWeight;
     @ApiModelProperty("阶梯价格")
     private String stepPrice;
+    private String periodValidity;
 }

src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsQuery.java

@@ -15,4 +15,5 @@ public class LpkGoodsQuery implements Query {
     private String customerSid;
     private String affiliation;
     private String brandId;
+    private String periodValidity;
 }

src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartQuery.java

@@ -12,5 +12,6 @@ public class ShoppingCartQuery implements Query {
     private String customerSid; //客户
     private String affiliation; //类型
     private String brandId;
+    private String periodValidity;
 
 }

src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java

@@ -118,6 +118,7 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp
             StpUtil.login(newCustomer.getId());
             SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
             newCustomer.setToken(tokenInfo.getTokenValue());
+            newCustomer.setMobile(lpkCustomer.getMobile());
 
             return rb.success().setData(newCustomer);
         }

src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml

@@ -92,7 +92,8 @@
             s.isAppletGrounding,
             s.content AS remark,
             s.weight ,
-            r.goodsNumber as goodsNumber
+            r.goodsNumber as goodsNumber,
+            s.periodValidity
         FROM
             vegetable_cellar r
                 LEFT JOIN lpk_goods s ON s.sid = r.goodsSid
@@ -110,9 +111,10 @@
                specificationUnit,
                isAppletGrounding,
                content as remark,
-               weight
+               weight,
+               periodValidity
         from lpk_goods
-        where isAppletGrounding=1 and useTo=1
+        where isAppletGrounding=1 and useTo=1 and date_format (periodValidity,'%Y-%m-%d') >= date_format(#{query.periodValidity},'%Y-%m-%d')
         <if test="query.brandId!=null and query.brandId!=''">
           and brandId =#{query.brandId}
         </if>

src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java

@@ -14,10 +14,12 @@ 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.*;
+import com.yxt.yythmall.api.lpkcustomer.LpkCustomer;
 import com.yxt.yythmall.api.lpkgiftcard.LpkGiftCardQuery;
 import com.yxt.yythmall.api.lpkgoods.*;
 import com.yxt.yythmall.api.shoppingcart.ShoppingCartQuery;
 import com.yxt.yythmall.api.shoppingcart.ShoppingCartVo;
+import com.yxt.yythmall.biz.lpkcustomer.LpkCustomerService;
 import com.yxt.yythmall.biz.shoppingcart.ShoppingCartService;
 import com.yxt.yythmall.mallplus.biz.pms.service.IPmsBrandService;
 import com.yxt.yythmall.mallplus.mbg.pms.entity.brand.BrandVo;
@@ -50,6 +52,8 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
     ShoppingCartService shoppingCartService;
     @Autowired
     private com.yxt.yythmall.mallplus.biz.pms.service.IPmsBrandService IPmsBrandService;
+    @Autowired
+    LpkCustomerService lpkCustomerService;
 
 
     public ResultBean<PagerVo<LpkGoodsVo>> goodsListPage(PagerQuery<LpkGoodsQuery> pq) {
@@ -225,6 +229,13 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
             double i=Double.valueOf(s.getGoodsNumber());
             s.setGoodsNumber(String.valueOf((int)i));
             s.setIconUrl(fileUploadComponent.getUrlPrefix()+s.getIconUrl());
+            if(s.getPeriodValidity()!=null){
+                //1>2 1 、1<2 -1 、1=2 0
+                int k= s.getPeriodValidity().compareTo(new Date());
+                if(k==-1){
+                    s.setState("1");
+                }
+            }
         });
         return rb.success().setData(vo);
     }
@@ -271,6 +282,10 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
         if(StringUtils.isBlank(query.getCustomerSid())){
             return rb.setMsg("参数不全");
         }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date=new Date();
+        String p=sdf.format(date);
+        query.setPeriodValidity(p);
         List<GiftBagGoodss> giftBagGoodss=baseMapper.getAllGoodsApplets(query);
         ShoppingCartQuery query1=new ShoppingCartQuery();
         query1.setBrandId(query.getBrandId());

src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.java

@@ -19,5 +19,7 @@ import java.util.List;
  */
 @Mapper
 public interface ShoppingCartMapper extends BaseMapper<ShoppingCart> {
-    List<ShoppingCartVo> ShoppingCartList(@Param("customerSid")String customerSid,@Param("brandId")String brandId);
+    List<ShoppingCartVo> ShoppingCartList(@Param("customerSid")String customerSid,
+                                          @Param("brandId")String brandId,
+                                          @Param("periodValidity")String periodValidity);
 }

src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml

@@ -18,6 +18,7 @@
         <where>
             r.customerSid =#{customerSid} and r.affiliation=#{brandId}
             and s.isAppletGrounding=1 and s.useTo=1
+            and date_format (s.periodValidity,'%Y-%m-%d') >= date_format(#{periodValidity},'%Y-%m-%d')
         </where>
     </select>
 </mapper>

src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java

@@ -34,7 +34,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -90,7 +92,10 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
         if(StringUtils.isBlank(query.getBrandId())){
             return rb.setMsg("参数不全");
         }
-        List<ShoppingCartVo> list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date=new Date();
+        String periodValidity=sdf.format(date);
+        List<ShoppingCartVo> list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId(),periodValidity);
         list.forEach(s -> {
             s.setTotalPrice(removeZeros(String.valueOf((Double.valueOf(s.getJPrice()) * Double.valueOf(s.getGoodsNumber())))));
             s.setIconUrl(fileUploadComponent.getUrlPrefix() + s.getIconUrl());
@@ -131,7 +136,10 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
         if(StringUtils.isBlank(query.getBrandId())){
             return rb.setMsg("参数不全");
         }
-        List<ShoppingCartVo> list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date=new Date();
+        String periodValidity=sdf.format(date);
+        List<ShoppingCartVo> list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId(),periodValidity);
         double price = 0;
         double standbyPrice =0;
         double weight = 0;