tashow/tashow-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化BUG

Browse Source
This commit is contained in:
xuelijun
2025-08-13 09:18:21 +08:00
parent 5987f02e4e
commit 257dc16c94
25 changed files with 669 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdDO.java
View File

@@ -8,6 +8,7 @@ import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
import com.tashow.cloud.productapi.general.StringListTypeHandler;
import lombok.*;
import java.util.Date;
import java.util.List;
/**
@@ -111,9 +112,15 @@ public class ProdDO extends BaseDO {
*/
private Integer status;
/**
* 商品分类
* 商品分类id
*/
private Long categoryId;
/**
* 商品分类名称
*/
private String categoryName;
/**
* 销量
*/
@@ -163,4 +170,9 @@ public class ProdDO extends BaseDO {
*/
private Integer top;
/**
* 删除时间
*/
private Date deleteTime;
}

7
tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdPropValueDO.java
View File

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
/**
* 属性规则 DO
*
@@ -59,4 +62,8 @@ public class ProdPropValueDO {
@TableField(exist=false)
private Integer isExist;
/**
* 删除时间
*/
private Date deleteTime;
}

14
tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/SkuDO.java
View File

@@ -87,9 +87,21 @@ public class SkuDO extends BaseDO {
*/
private String overview;
/**
* 库存(-1代表无限库存)
* 库存
*/
private Integer stocks;
/**
* 总库存是0 无线库存是1
*/
private Integer stocksFlg;
/**
* 锁定库存数
*/
@TableField(exist=false)
private Integer stocksLockNum;
/**
* 预警库存
*/

74
tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdListVO.java Normal file
View File

@@ -0,0 +1,74 @@
package com.tashow.cloud.productapi.api.product.vo.prod;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.tashow.cloud.productapi.api.product.dto.*;
import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoVO;
import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasInfoVO;
import com.tashow.cloud.productapi.general.StringListTypeHandler;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@Schema(description = "商品服务配置 VO")
@Data
public class ProdListVO {
/**
* 产品ID
*/
@TableId
private Long prodId;
/**
* 商品名称
*/
private String prodName;
/**
* 商品简称
*/
private String abbreviation;
/**
* 店铺id
*/
private Long shopId;
/**
* 是否置灰0否1是
*/
private Integer isProhibit;
/**
* 审核备注
*/
private String processNotes;
/**
* 详细描述
*/
private String content;
/**
* 商品编号
*/
private String prodNumber;
/**
* 商品主图
*/
private String pic;
/**
* 商品轮播图片，以,分割
*/
private String imgs;
/**
* 商品轮播图片，以,分割
*/
private String whiteImg;
/**
* 默认是1，正常状态（出售中）, 0：下架（仓库中） 2：待审核
*/
private Integer status;
}

100
tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdPageReqVO.java
View File

@@ -21,110 +21,22 @@ public class ProdPageReqVO extends PageParam {
@Schema(description = "商品名称", example = "赵六")
private String prodName;
@Schema(description = "商品简称")
private String abbreviation;
@Schema(description = "seo标题", example = "李四")
private String seoShortName;
@Schema(description = "seo搜索")
private String seoSearch;
@Schema(description = "关键词")
private String keyword;
@Schema(description = "店铺id", example = "10843")
private Long shopId;
@Schema(description = "简要描述,卖点等")
private String brief;
@Schema(description = "品牌")
private String brand;
@Schema(description = "详细描述")
private String content;
@Schema(description = "'是否置灰0否1是'")
private Integer isProhibit;
@Schema(description = "审核备注")
private String processNotes;
/**
* 标签
*/
public List<String> tag;
@Schema(description = "商品编号")
private String prodNumber;
@Schema(description = "商品主图")
private String pic;
@Schema(description = "商品轮播图片，以,分割")
private String imgs;
/**
* 视频
*/
private String video;
/**
* 商品轮播图片，以,分割
*/
private String whiteImg;
@Schema(description = "默认是1，正常状态（出售中）, 0：下架（仓库中） 2：待审核", example = "2")
private Integer status;
@Schema(description = "商品分类", example = "14895")
private Long categoryId;
@Schema(description = "销量")
private Integer soldNum;
@Schema(description = "分享图")
private String shareImage;
@Schema(description = "分享话术")
private String shareContent;
@Schema(description = "是否开启区域0关1开")
private Integer regionSwitch;
@Schema(description = "是否特殊时段0关1开")
private Integer additionalSwitch;
@Schema(description = "是否特殊日期（节假日周末什么的）0关1开")
private Integer additionalFeeSwitch;
@Schema(description = "是否紧急响应服务0关1开")
private Integer emergencySwitch;
@Schema(description = "是否预约0关1开")
private Integer reservationSwitch;
@Schema(description = "是否接单上线0关1开")
private Integer orderLimitSwitch;
@Schema(description = "是否开启体重配置0关1开")
private Integer weightSwitch;
/**
* 商品分类名称
*/
private String categoryName;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "创建人")
private String createBy;
@Schema(description = "修改人")
private String updateBy;
@Schema(description = "版本 乐观锁")
private Integer version;
@Schema(description = "展示的权重")
private Integer top;
//@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private String[] createTime;
}

22
tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdRecycleBinVO.java Normal file
View File

@@ -0,0 +1,22 @@
package com.tashow.cloud.productapi.api.product.vo.prod;
import com.tashow.cloud.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@Schema(description = "商品回收站分页查询")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class ProdRecycleBinVO extends PageParam {
@Schema(description = "商品名称", example = "18784")
private String prodName;
@Schema(description = "删除时间")
//@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private String[] deleteTime;
}

5
tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdRespVO.java
View File

@@ -84,6 +84,11 @@ public class ProdRespVO {
@ExcelProperty("商品分类")
private Long categoryId;
/**
* 商品分类名称
*/
private String categoryName;
@Schema(description = "销量")
@ExcelProperty("销量")
private Integer soldNum;

9
tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdSaveReqVO.java
View File

@@ -15,8 +15,8 @@ public class ProdSaveReqVO {
@Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6943")
private Long prodId;
@Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@NotEmpty(message = "商品名称不能为空")
//@Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
//@NotEmpty(message = "商品名称不能为空")
private String prodName;
@Schema(description = "商品简称")
@@ -31,6 +31,11 @@ public class ProdSaveReqVO {
@Schema(description = "关键词")
private String keyword;
/**
* 商品分类名称
*/
private String categoryName;
@Schema(description = "店铺id", example = "10843")
private Long shopId;

1
tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodprop/ProdPropSaveReqVO.java
View File

@@ -11,6 +11,7 @@ import java.util.List;
@Schema(description = "管理后台 - 商品属性新增/修改 Request VO")
@Data
public class ProdPropSaveReqVO {
private Long id;
@Schema(description = "属性id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14271")
private Long propId;

3
tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuPageReqVO.java
View File

@@ -18,4 +18,7 @@ public class SkuPageReqVO extends PageParam {
@Schema(description = "销售属性组合字符串")
private String properties;
@Schema(description = "skuID", example = "18784")
private Long skuId;
}

13
tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuRespVO.java
View File

@@ -2,6 +2,7 @@ package com.tashow.cloud.productapi.api.product.vo.sku;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -70,6 +71,18 @@ public class SkuRespVO {
@ExcelProperty("库存")
private Integer stocks;
@Schema(description = "总库存是0 无线库存是1")
@ExcelProperty("总库存是0 无线库存是1")
private Integer stocksFlg;
/**
* 锁定库存数
*/
@Schema(description = "锁定库存数")
@ExcelProperty("锁定库存数")
private Integer stocksLockNum;
@Schema(description = "预警库存")
@ExcelProperty("预警库存")
private Integer warnStocks;

9
tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuSaveReqVO.java
View File

@@ -1,5 +1,6 @@
package com.tashow.cloud.productapi.api.product.vo.sku;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@@ -55,6 +56,14 @@ public class SkuSaveReqVO {
@Schema(description = "库存")
private Integer stocks;
@Schema(description = "总库存是0 无线库存是1")
private Integer stocksFlg;
/**
* 锁定库存数
*/
@Schema(description = "锁定库存数")
private Integer stocksLockNum;
@Schema(description = "预警库存")
private Integer warnStocks;