From ff5cebf20330a4c3956f38a3ede4e93c37c0fac7 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 19 Nov 2024 17:07:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=A5=97=E9=A4=90=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/pojo/product/TbProduct.java | 5 ++++- .../impl/productimpl/TbProductServiceImpl.java | 11 +++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java index 04598356..73a8fe2d 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java @@ -17,6 +17,7 @@ package cn.ysk.cashier.pojo.product; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import cn.ysk.cashier.vo.ProductGroupVo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -220,7 +221,9 @@ public class TbProduct implements Serializable { @Transient @TableField(exist = false) private List> specList; - + @Transient + @TableField(exist = false) + private List proGroupVo; public void copy(TbProduct source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java index fe562882..3c05d239 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java @@ -3,6 +3,7 @@ package cn.ysk.cashier.service.impl.productimpl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.ysk.cashier.cons.domain.ViewConSku; import cn.ysk.cashier.cons.repository.ViewConSkuRepository; @@ -14,7 +15,6 @@ import cn.ysk.cashier.dto.product.TbProductSortCriteria; import cn.ysk.cashier.dto.shop.TbCouponCategoryDto; import cn.ysk.cashier.exception.BadRequestException; import cn.ysk.cashier.mapper.product.TbProductMapper; -import cn.ysk.cashier.mapper.product.TbProductSkuMapper; import cn.ysk.cashier.mybatis.entity.TagProductDepts; import cn.ysk.cashier.mybatis.mapper.TbProducSkutMapper; import cn.ysk.cashier.mybatis.service.TagProductDeptsService; @@ -764,10 +764,14 @@ public class TbProductServiceImpl implements TbProductService { com.baomidou.mybatisplus.extension.plugins.pagination.Page page1 = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page, size); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("is_del", 0) - .in("type_enum", "sku", "normal") + .eq(false,"type", "coupon") .eq("shop_id", shopId) .eq("is_delete", 0) .eq("status", 1) + .eq("is_del", 0) + .like("days", DateUtil.dayOfWeekEnum(new Date()).getValue()) + .gt("end_time", System.currentTimeMillis()) + .lt("start_time", System.currentTimeMillis()) .eq("is_pause_sale", 0); // 查询skuResult @@ -783,6 +787,9 @@ public class TbProductServiceImpl implements TbProductService { com.baomidou.mybatisplus.extension.plugins.pagination.Page tbProductPage = productMapper.selectPage(page1, queryWrapper); tbProductPage.getRecords().forEach(item -> { + if("package".equals(item.getType())){ + item.setProGroupVo(JSONUtil.parseJSONStrTList(item.getGroupSnap(), ProductGroupVo.class)); + } TbProductSkuResult skuResult = productSkuResultRepository.findById(item.getId()).orElse(null); List tbProductSkus = producSkutMapper.selectList(new LambdaQueryWrapper().eq(TbProductSku::getIsDel, 0) .eq(TbProductSku::getIsPauseSale, 0)