czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangw
2025-02-17 14:51:39 +08:00
parent ef3cbe85b1 563e8d4096
commit 0fb80255ae
17 changed files with 723 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProdGroupDTO.java Normal file
View File

@@ -0,0 +1,102 @@
package com.czg.product.dto;
import com.alibaba.fastjson2.annotation.JSONField;
import com.czg.validator.group.DefaultGroup;
import com.czg.validator.group.Group;
import com.czg.validator.group.InsertGroup;
import com.czg.validator.group.UpdateGroup;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Null;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.List;
/**
* 商品分组
*
* @author Tankaikai tankaikai@aliyun.com
* @since 1.0 2025-02-17
*/
@Data
public class ProdGroupDTO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@Null(message = "ID必须为空", groups = InsertGroup.class)
@NotNull(message = "ID不能为空", groups = UpdateGroup.class)
private Long id;
/**
* 分组名称
*/
@NotBlank(message = "分组名称不能为空", groups = DefaultGroup.class)
private String name;
/**
* 店铺Id
*/
private Long shopId;
/**
* 图标
*/
private String pic;
/**
* 状态 0-禁用 1-启用
*/
@NotNull(message = "状态不能为空", groups = Group.class)
private Integer status;
/**
* 排序
*/
@NotNull(message = "排序值不能为空", groups = DefaultGroup.class)
@Min(value = 0, message = "排序值不能小于0", groups = DefaultGroup.class)
private Integer sort;
/**
* 排序方式 0-默认; 1-价格从高到低; 2-销量由高到低;
*/
@NotNull(message = "排序方式不能为空", groups = Group.class)
private String sortMode;
/**
* 开启时间管控 0:否；1:是
*/
@NotNull(message = "售卖时间管控不能为空", groups = Group.class)
private Integer useTime;
/**
* 售卖开始时间
*/
@JSONField(format = "HH:mm:ss")
private LocalTime saleStartTime;
/**
* 售卖结束时间
*/
@JSONField(format = "HH:mm:ss")
private LocalTime saleEndTime;
/**
* 创建时间
*/
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
* 更新时间
*/
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
/**
* 商品ID数组
*/
private Long[] productIds;
/**
* 商品简要信息列表
*/
private List<ProductBriefDTO> productList;
}

33
cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProdGroupRelationDTO.java Normal file
View File

@@ -0,0 +1,33 @@
package com.czg.product.dto;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 商品分组关系
*
* @author Tankaikai tankaikai@aliyun.com
* @since 1.0 2025-02-17
*/
@Data
public class ProdGroupRelationDTO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 商品id
*/
private Long productId;
/**
* 商品分组id
*/
private Long prodGroupId;
/**
* 排序值
*/
private Integer sort;
}

33
cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductBriefDTO.java Normal file
View File

@@ -0,0 +1,33 @@
package com.czg.product.dto;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 商品简要信息
*
* @author Tankaikai tankaikai@aliyun.com
* @since 1.0 2025-02-16
*/
@Data
public class ProductBriefDTO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
private Long id;
/**
* 商品名称
*/
private String name;
/**
* 商品封面图
*/
private String coverImg;
}

2
cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java
View File

@@ -95,7 +95,7 @@ public class ProductDTO implements Serializable {
/**
* 商品封面图
*/
@NotBlank(message = "商品名称不能为空", groups = DefaultGroup.class)
@NotBlank(message = "商品封面图不能为空", groups = DefaultGroup.class)
private String coverImg;
/**
* 商品图片（第一张为缩略图，其他为详情）

78
cash-common/cash-common-service/src/main/java/com/czg/product/entity/ProdGroup.java Normal file
View File

@@ -0,0 +1,78 @@
package com.czg.product.entity;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.annotation.Table;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.time.LocalTime;
/**
* 商品分组
*
* @author Tankaikai tankaikai@aliyun.com
* @since 1.0 2025-02-17
*/
@Data
@Table("tb_prod_group")
public class ProdGroup implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@Id(keyType = KeyType.Auto)
private Long id;
/**
* 分组名称
*/
private String name;
/**
* 店铺Id
*/
private Long shopId;
/**
* 图标
*/
private String pic;
/**
* 状态 0-禁用 1-启用
*/
private Integer status;
/**
* 排序
*/
private Integer sort;
/**
* 排序方式 0-默认; 1-价格从高到低; 2-销量由高到低;
*/
private String sortMode;
/**
* 开启时间管控 0:否；1:是
*/
private Integer useTime;
/**
* 售卖开始时间
*/
private LocalTime saleStartTime;
/**
* 售卖结束时间
*/
private LocalTime saleEndTime;
/**
* 创建时间
*/
@Column(onInsertValue = "now()")
private LocalDateTime createTime;
/**
* 更新时间
*/
@Column(onInsertValue = "now()", onUpdateValue = "now()")
private LocalDateTime updateTime;
}

38
cash-common/cash-common-service/src/main/java/com/czg/product/entity/ProdGroupRelation.java Normal file
View File

@@ -0,0 +1,38 @@
package com.czg.product.entity;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.annotation.Table;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 商品分组关系
*
* @author Tankaikai tankaikai@aliyun.com
* @since 1.0 2025-02-17
*/
@Data
@Table("tb_prod_group_relation")
public class ProdGroupRelation implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 商品id
*/
@Id(keyType = KeyType.None)
private Long productId;
/**
* 商品分组id
*/
@Id(keyType = KeyType.None)
private Long prodGroupId;
/**
* 排序值
*/
private Integer sort;
}

15
cash-common/cash-common-service/src/main/java/com/czg/product/service/ProdGroupRelationService.java Normal file
View File

@@ -0,0 +1,15 @@
package com.czg.product.service;
import com.czg.product.entity.ProdGroupRelation;
import com.mybatisflex.core.service.IService;
/**
* 商品分组关系
*
* @author Tankaikai tankaikai@aliyun.com
* @since 1.0 2025-02-17
*/
public interface ProdGroupRelationService extends IService<ProdGroupRelation> {
}

33
cash-common/cash-common-service/src/main/java/com/czg/product/service/ProdGroupService.java Normal file
View File

@@ -0,0 +1,33 @@
package com.czg.product.service;
import com.czg.product.dto.ProdGroupDTO;
import com.czg.product.entity.ProdGroup;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import java.util.List;
/**
* 商品分组
*
* @author Tankaikai tankaikai@aliyun.com
* @since 1.0 2025-02-17
*/
public interface ProdGroupService extends IService<ProdGroup> {
Page<ProdGroupDTO> getProdGroupPage(ProdGroupDTO param);
List<ProdGroupDTO> getProdGroupList(ProdGroupDTO param);
ProdGroupDTO getProdGroupById(Long id);
boolean addProdGroup(ProdGroupDTO dto);
boolean deleteProdGroup(Long id);
boolean updateProdGroup(ProdGroupDTO dto);
boolean disableProdGroup(Long id);
boolean enableProdGroup(Long id);
}

3
cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductGroupVo.java
View File

@@ -3,6 +3,7 @@ package com.czg.product.vo;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +27,6 @@ public class ProductGroupVo {
private String skuName;
private BigDecimal price;
private String number;
private String unitName;
private LocalTime unitName;
}
}