From 3b2c5fb47caca6ab286e0c8ed8c0575024c528d0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期六, 11 十月 2025 09:18:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java | 14 +++++++
framework/src/main/java/cn/lili/modules/order/order/entity/enums/CustomizeFlagEnum.java | 29 ++++++++++++++
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java | 9 ++++
framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java | 10 +++++
4 files changed, 62 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 2882af1..c934cdc 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
@@ -13,6 +13,7 @@
import cn.lili.modules.goods.entity.enums.GoodsSalesModeEnum;
import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
import cn.lili.modules.goods.entity.enums.GoodsTypeEnum;
+import cn.lili.modules.order.order.entity.enums.CustomizeFlagEnum;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -182,6 +183,13 @@
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String virtualGoodsType;
+ @ApiModelProperty(value ="琛ㄧず铏氭嫙瀹氬埗鍟嗗搧绫诲瀷 鐜版湁绫诲瀷锛氬畾鍒跺晢鍝�")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ /**
+ * @see CustomizeFlagEnum
+ */
+ private String customizeFlag;
+
public Goods() {
}
@@ -200,6 +208,7 @@
this.goodsVideo = goodsOperationDTO.getGoodsVideo();
this.price = goodsOperationDTO.getPrice();
this.virtualGoodsType = goodsOperationDTO.getVirtualGoodsType();
+ this.customizeFlag = goodsOperationDTO.getCustomizeFlag();
//涓嶆槸棰勫敭鍟嗗搧棰勫敭鏃堕棿缃┖
if (!GoodsSalesModeEnum.PRESALE.name().equals(goodsOperationDTO.getSalesModel())) {
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
index 6f968a3..7a45978 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
@@ -2,6 +2,7 @@
import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
+import cn.lili.modules.order.order.entity.enums.CustomizeFlagEnum;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -176,6 +177,19 @@
@ApiModelProperty(value ="浼樻儬鍔靛悕")
private String couponName;
+ @ApiModelProperty(value ="瀹氬埗妯℃澘id")
+ private String customizeTemplateId;
+
+ @ApiModelProperty(value ="瀹氬埗妯℃澘鍚嶇О")
+ private String customizeTemplateName;
+
+ @ApiModelProperty(value ="琛ㄧず铏氭嫙瀹氬埗鍟嗗搧绫诲瀷 鐜版湁绫诲瀷锛氬畾鍒跺晢鍝�")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ /**
+ * @see CustomizeFlagEnum
+ */
+ private String customizeFlag;
+
public Double getWeight() {
if (weight == null) {
return 0d;
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 89323d9..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,6 +3,9 @@
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.*;
@@ -166,6 +169,13 @@
@ApiModelProperty(value ="琛ㄧず铏氭嫙鍟嗗搧绫诲瀷 鐜版湁绫诲瀷锛欳OUPON浼樻儬鍔�")
private String virtualGoodsType;
+ @ApiModelProperty(value ="琛ㄧず铏氭嫙瀹氬埗鍟嗗搧绫诲瀷 鐜版湁绫诲瀷锛氬畾鍒跺晢鍝�")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ /**
+ * @see CustomizeFlagEnum
+ */
+ private String customizeFlag;
+
public String getGoodsName() {
//瀵瑰晢鍝佸鍚嶇О鍋氫竴涓瀬闄愬鐞嗐�傝繖閲屾病鏈夌敤xss杩囨护鏄洜涓簒ss杩囨护涓哄叏灞�杩囨护锛屽奖鍝嶅緢澶с��
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CustomizeFlagEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CustomizeFlagEnum.java
new file mode 100644
index 0000000..bda312f
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CustomizeFlagEnum.java
@@ -0,0 +1,29 @@
+package cn.lili.modules.order.order.entity.enums;
+
+/**
+ * 瀹氬埗鍟嗗搧
+ *
+ **/
+public enum CustomizeFlagEnum {
+
+ /**
+ * 瀹氬埗鍟嗗搧
+ */
+ CUSTOMIZE("瀹氬埗鍟嗗搧"),
+
+ /**
+ * 涓嶆槸瀹氬埗鍟嗗搧
+ */
+ NOT_CUSTOMIZE("涓嶆槸瀹氬埗鍟嗗搧");
+
+ private final String description;
+
+ CustomizeFlagEnum(String description) {
+ this.description = description;
+ }
+
+ public String description() {
+ return this.description;
+ }
+
+}
--
Gitblit v1.8.0