From a4648ac40f9b100cbbbb5382f8d2e10d50f8a155 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Fri, 24 Sep 2021 16:20:01 +0800
Subject: [PATCH] DraftGoods get intro and mobileIntro method by HTML unescape

---
 .../modules/goods/entity/dos/DraftGoods.java  | 22 +++++++++++++++++--
 .../lili/modules/goods/entity/dos/Goods.java  |  2 ++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java
index c8e0fe3b..99ba2180 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java
@@ -1,13 +1,16 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.mybatis.BaseEntity;
+import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.http.HtmlUtil;
 import cn.lili.modules.goods.entity.enums.DraftGoodsSaveType;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
+import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 
@@ -19,6 +22,7 @@ import javax.validation.constraints.Max;
  * @author pikachu
  * @since 2020-02-23 9:14:33
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("li_draft_goods")
 @ApiModel(value = "草稿商品")
@@ -137,7 +141,7 @@ public class DraftGoods extends BaseEntity {
 
     @ApiModelProperty(value = "商品图片JSON")
     private String goodsGalleryListJson;
- 
+
     @ApiModelProperty(value = "sku列表JSON")
     private String skuListJson;
 
@@ -147,4 +151,18 @@ public class DraftGoods extends BaseEntity {
     @ApiModelProperty(value = "商品类型", required = true)
     private String goodsType;
 
+    public String getIntro() {
+        if (CharSequenceUtil.isNotEmpty(intro)) {
+            return HtmlUtil.unescape(intro);
+        }
+        return intro;
+    }
+
+    public String getMobileIntro() {
+        if (CharSequenceUtil.isNotEmpty(mobileIntro)) {
+            return HtmlUtil.unescape(mobileIntro);
+        }
+        return mobileIntro;
+    }
+
 }
\ No newline at end of file
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 03943a5b..51413d84 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
@@ -16,6 +16,7 @@ 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 javax.validation.constraints.Max;
@@ -27,6 +28,7 @@ import java.util.Map;
  * @author pikachu
  * @since 2020-02-23 9:14:33
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("li_goods")
 @ApiModel(value = "商品")