From d4d9ea89dd109cb975eaa3412a15c5ff6e8d11dd Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 02 七月 2025 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
index 029a66c..f233523 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
@@ -14,18 +14,24 @@
import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
import cn.lili.modules.goods.entity.enums.GoodsTypeEnum;
import cn.lili.mybatis.BaseEntity;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xkcoding.http.util.StringUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
import java.util.Map;
/**
@@ -87,12 +93,15 @@
private Double grade;
@ApiModelProperty(value = "缂╃暐鍥捐矾寰�")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String thumbnail;
@ApiModelProperty(value = "灏忓浘璺緞")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String small;
@ApiModelProperty(value = "鍘熷浘璺緞")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String original;
@ApiModelProperty(value = "搴楅摵鍒嗙被id")
@@ -129,6 +138,7 @@
private String mobileIntro;
@ApiModelProperty(value = "鍟嗗搧瑙嗛")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String goodsVideo;
@@ -151,7 +161,17 @@
@ApiModelProperty(value = "鍟嗗搧鍙傛暟json", hidden = true)
private String params;
+ @ApiModelProperty(value = "棰勫敭缁撴潫鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date preSaleEndDate;
+ @ApiModelProperty(value = "棰勫敭寮�濮嬫椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date preSaleBeginDate;
+ @ApiModelProperty(value = "鎶芥垚姣斾緥")
+ private BigDecimal commission;
public Goods() {
}
@@ -169,6 +189,9 @@
this.mobileIntro = goodsOperationDTO.getMobileIntro();
this.goodsVideo = goodsOperationDTO.getGoodsVideo();
this.price = goodsOperationDTO.getPrice();
+ this.preSaleEndDate = goodsOperationDTO.getPreSaleEndDate();
+ this.preSaleBeginDate = goodsOperationDTO.getPreSaleBeginDate();
+ this.commission = goodsOperationDTO.getCommission();
if (goodsOperationDTO.getGoodsParamsDTOList() != null && goodsOperationDTO.getGoodsParamsDTOList().isEmpty()) {
this.params = JSONUtil.toJsonStr(goodsOperationDTO.getGoodsParamsDTOList());
}
--
Gitblit v1.8.0