From 0c9521d93a745de0ec71d83c094a6047c0222398 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 29 十月 2025 15:01:51 +0800
Subject: [PATCH] 调整
---
framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
index b795f16..d735c3e 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
@@ -3,17 +3,20 @@
import cn.lili.common.validation.EnumValue;
import cn.lili.modules.goods.entity.enums.GoodsSalesModeEnum;
import cn.lili.modules.goods.entity.enums.GoodsTypeEnum;
+import cn.lili.modules.order.order.entity.enums.CustomizeFlagEnum;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.Valid;
import javax.validation.constraints.*;
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.util.*;
/**
* 鍟嗗搧鎿嶄綔DTO
@@ -141,6 +144,39 @@
@ApiModelProperty(value = "娴忚鏉冮檺")
private String browsePermissions;
+
+ @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 = "鎶芥垚姣斾緥")
+ @DecimalMax(value = "100",message = "鎶芥垚姣斾緥蹇呴』灏忎簬100")
+ @DecimalMin(value = "0",message = "鎶芥垚姣斾緥蹇呴』澶т簬0")
+ private BigDecimal commission;
+ @ApiModelProperty(value = "鍟嗗搧鎺掑簭")
+ private Integer goodsSort;
+ @ApiModelProperty(value = "浼樻儬鍔礽d")
+ private String couponId;
+ @ApiModelProperty(value = "浼樻儬鍔靛悕")
+ private String couponName;
+
+ @ApiModelProperty(value ="琛ㄧず铏氭嫙鍟嗗搧绫诲瀷 鐜版湁绫诲瀷锛欳OUPON浼樻儬鍔�")
+ private String virtualGoodsType;
+
+ @ApiModelProperty(value ="琛ㄧず铏氭嫙瀹氬埗鍟嗗搧绫诲瀷 鐜版湁绫诲瀷锛氬畾鍒跺晢鍝�")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ /**
+ * @see CustomizeFlagEnum
+ */
+ private String customizeFlag;
+
+
public String getGoodsName() {
//瀵瑰晢鍝佸鍚嶇О鍋氫竴涓瀬闄愬鐞嗐�傝繖閲屾病鏈夌敤xss杩囨护鏄洜涓簒ss杩囨护涓哄叏灞�杩囨护锛屽奖鍝嶅緢澶с��
// 涓氬姟涓紝鍏ㄥ眬浠ｇ爜涓彧鏈夊晢鍝佸悕绉颁笉鑳芥嫢鏈夎嫳鏂囬�楀彿锛屾槸鐢变簬鍟嗗搧鍚嶇О瀛樺湪涓�涓暟鎹簱鑱斿悎鏌ヨ锛岀粨鏋滆鏍规嵁閫楀彿鍒嗙粍
--
Gitblit v1.8.0