From e3ee4595daf95fab3c7f122a23c260d738ea2f51 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 6 Feb 2024 14:37:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=8F=90=E8=B4=A7=E6=9C=89?= =?UTF-8?q?=E6=95=88=E6=9C=9F=EF=BC=8C=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yythmall/api/appletgiftbag/GiftBagGoodss.java | 6 ++++++ .../yxt/yythmall/api/appletgiftbag/MyGoodsVo.java | 9 ++++++--- .../api/lpkgiftcard/LpkGiftCardQuery.java | 1 + .../com/yxt/yythmall/api/lpkgoods/LpkGoods.java | 1 + .../yythmall/api/lpkgoods/LpkGoodsDetailsVo.java | 1 + .../yxt/yythmall/api/lpkgoods/LpkGoodsDto.java | 1 + .../yxt/yythmall/api/lpkgoods/LpkGoodsQuery.java | 1 + .../api/shoppingcart/ShoppingCartQuery.java | 1 + .../biz/lpkcustomer/LpkCustomerService.java | 1 + .../yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml | 8 +++++--- .../yythmall/biz/lpkgoods/LpkGoodsService.java | 15 +++++++++++++++ .../biz/shoppingcart/ShoppingCartMapper.java | 4 +++- .../biz/shoppingcart/ShoppingCartMapper.xml | 1 + .../biz/shoppingcart/ShoppingCartService.java | 12 ++++++++++-- 14 files changed, 53 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/yxt/yythmall/api/appletgiftbag/GiftBagGoodss.java b/src/main/java/com/yxt/yythmall/api/appletgiftbag/GiftBagGoodss.java index 42a1e92..b617f6d 100644 --- a/src/main/java/com/yxt/yythmall/api/appletgiftbag/GiftBagGoodss.java +++ b/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"; diff --git a/src/main/java/com/yxt/yythmall/api/appletgiftbag/MyGoodsVo.java b/src/main/java/com/yxt/yythmall/api/appletgiftbag/MyGoodsVo.java index 40c633d..68ee30f 100644 --- a/src/main/java/com/yxt/yythmall/api/appletgiftbag/MyGoodsVo.java +++ b/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已过期 } diff --git a/src/main/java/com/yxt/yythmall/api/lpkgiftcard/LpkGiftCardQuery.java b/src/main/java/com/yxt/yythmall/api/lpkgiftcard/LpkGiftCardQuery.java index b98b0ea..b6afdf1 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgiftcard/LpkGiftCardQuery.java +++ b/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; } diff --git a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoods.java b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoods.java index 653e46d..62a2efd 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoods.java +++ b/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; } diff --git a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java index 17684d6..50677fd 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java +++ b/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; } diff --git a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDto.java b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDto.java index 7ee77e4..707b5d5 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDto.java +++ b/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; } 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 5d3aa8e..d0685f2 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsQuery.java +++ b/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; } diff --git a/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartQuery.java b/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartQuery.java index 2535a5c..7b41d63 100644 --- a/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartQuery.java +++ b/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; } diff --git a/src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java b/src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java index a27d3e4..45bb2e6 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java @@ -118,6 +118,7 @@ public class LpkCustomerService extends MybatisBaseService= date_format(#{query.periodValidity},'%Y-%m-%d') and brandId =#{query.brandId} 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 0eb79ad..3bc10a8 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java +++ b/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> goodsListPage(PagerQuery pq) { @@ -225,6 +229,13 @@ public class LpkGoodsService extends MybatisBaseService2 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 giftBagGoodss=baseMapper.getAllGoodsApplets(query); ShoppingCartQuery query1=new ShoppingCartQuery(); query1.setBrandId(query.getBrandId()); diff --git a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.java b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.java index 5186a8e..e4dbe83 100644 --- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.java +++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.java @@ -19,5 +19,7 @@ import java.util.List; */ @Mapper public interface ShoppingCartMapper extends BaseMapper { - List ShoppingCartList(@Param("customerSid")String customerSid,@Param("brandId")String brandId); + List ShoppingCartList(@Param("customerSid")String customerSid, + @Param("brandId")String brandId, + @Param("periodValidity")String periodValidity); } diff --git a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml index fc345df..04a1f13 100644 --- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml +++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml @@ -18,6 +18,7 @@ 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') \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java index 144d7d2..e848c38 100644 --- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java +++ b/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 list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date date=new Date(); + String periodValidity=sdf.format(date); + List 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 list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date date=new Date(); + String periodValidity=sdf.format(date); + List list = baseMapper.ShoppingCartList(query.getCustomerSid(), query.getBrandId(),periodValidity); double price = 0; double standbyPrice =0; double weight = 0;