From 410c9bab0d4ddcdd19940755daad1b79ff736996 Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Mon, 17 Feb 2025 18:12:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=A8=A1=E5=9D=97=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/product/dto/ProdGroupDTO.java     |  6 ++++++
 .../java/com/czg/product/dto/ProductDTO.java  | 20 +++++++++++++++++--
 .../java/com/czg/product/entity/Product.java  |  4 ++--
 .../com/czg/product/vo/ProductGroupVo.java    | 10 +++++++++-
 .../service/impl/ProductServiceImpl.java      |  6 ++++++
 5 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProdGroupDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProdGroupDTO.java
index 867c3498..76485ba0 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProdGroupDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProdGroupDTO.java
@@ -16,6 +16,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.List;
+import java.util.Map;
 
 /**
 * 商品分组
@@ -99,4 +100,9 @@ public class ProdGroupDTO implements Serializable {
      * 商品简要信息列表
      */
     private List<ProductBriefDTO> productList;
+
+    /**
+     * 分组商品信息，用于小程序首页展示
+     */
+    private List<Map<String,Object>> products;
 }
\ No newline at end of file
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java
index ba4bfa46..4dfe4c8a 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java
@@ -137,9 +137,9 @@ public class ProductDTO implements Serializable {
     @JSONField(format = "HH:mm:ss")
     private LocalTime endTime;
     /**
-     * 规格详情
+     * 选中规格
      */
-    private String specInfo;
+    private Object selectSpecInfo;
     /**
      * 排序
      */
@@ -200,7 +200,23 @@ public class ProductDTO implements Serializable {
 
     private List<ProductGroupVo> proGroupVo;
 
+    /**
+     * 创建开始时间
+     */
+    private LocalDateTime createBeginTime;
+    /**
+     * 创建结束时间
+     */
+    private LocalDateTime createEndTime;
+
     public Object getImages() {
         return JSON.parseArray(Convert.toStr(images, "[]"));
     }
+
+    /**
+     * {"口味":[{"甜度":["少甜","中甜","多甜"]},{"辣度":["微辣","重辣","变态辣"]},{"小料":["葱花","香菜","折耳根"]}]}
+     */
+    public Object getSelectSpecInfo() {
+        return JSON.parseObject(Convert.toStr(selectSpecInfo, "{}"));
+    }
 }
\ No newline at end of file
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java
index ee7795fc..f3d4d1d5 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java
@@ -103,9 +103,9 @@ public class Product implements Serializable {
 	*/
 	private LocalTime endTime;
 	/**
-	* 规格详情
+	* 选中规格
 	*/
-	private String specInfo;
+	private String selectSpecInfo;
 	/**
 	* 排序
 	*/
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductGroupVo.java b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductGroupVo.java
index b84f47e7..6d3b0267 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductGroupVo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductGroupVo.java
@@ -2,13 +2,21 @@ package com.czg.product.vo;
 
 import lombok.Data;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @author Administrator
+ */
 @Data
-public class ProductGroupVo {
+public class ProductGroupVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     private Integer count;
     //选几个
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
index 5fa34ae5..c4da214e 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java
@@ -58,6 +58,12 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         if (ObjUtil.isNotNull(param.getSpecId())) {
             queryWrapper.like(Product::getSpecId, param.getSpecId());
         }
+        if (ObjUtil.isNotNull(param.getCreateBeginTime())) {
+            queryWrapper.ge(Product::getCreateTime, param.getCreateBeginTime());
+        }
+        if (ObjUtil.isNotNull(param.getCreateEndTime())) {
+            queryWrapper.le(Product::getCreateTime, param.getCreateEndTime());
+        }
         Long shopId = StpKit.USER.getLoginIdAsLong();
         queryWrapper.eq(Product::getShopId, shopId);
         queryWrapper.eq(Product::getIsDel, DeleteEnum.NORMAL.value());