Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java

@@ -1,9 +1,10 @@
 package com.czg.account.dto.shopuser;
 
+import com.czg.enums.ShopUserFlowBizEnum;
 import jakarta.validation.constraints.DecimalMax;
 import jakarta.validation.constraints.DecimalMin;
-import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -12,6 +13,7 @@ import java.math.BigDecimal;
  * @author Administrator
  */
 @Data
+@Builder
 public class ShopUserMoneyEditDTO {
     /**
      * 对应shopUserid
@@ -30,6 +32,8 @@ public class ShopUserMoneyEditDTO {
     @DecimalMin("0.01")
     @DecimalMax("9999")
     private BigDecimal money;
+
+    private ShopUserFlowBizEnum bizEnum;
     /**
      * 备注
      */

cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderPayment.java

@@ -84,7 +84,7 @@ public class OrderPayment implements Serializable {
     public OrderPayment() {
     }
 
-    public OrderPayment(@NonNull Long shopId, @NonNull Long sourceId, @NotBlank String payType, @NotBlank String orderNo,
+    public OrderPayment(@NonNull Long shopId,@NonNull Long sourceId, @NotBlank String payType, @NotBlank String orderNo,
                         String authCode, @NonNull BigDecimal amount) {
         this.shopId = shopId;
         this.sourceId = sourceId;

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;
 }

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, "{}"));
+    }
 }

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;
 	/**
 	* 排序
 	*/

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;
     //选几个