caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!30 unescape to goods get the intro

Browse Source 
Merge pull request !30 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2021-09-17 06:28:25 +00:00 committed by Gitee
commit a3d73bf7ad
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
View File

@ -1,6 +1,8 @@
package cn.lili.modules.goods.entity.dos; package cn.lili.modules.goods.entity.dos;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.http.HtmlUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException; import cn.lili.common.exception.ServiceException;
@ -247,4 +249,19 @@ public class Goods extends BaseEntity {
} }
} }
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;
}
} }

2
framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java
View File

@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -21,6 +22,7 @@ import java.util.Date;
* @author Chopper * @author Chopper
* @since 2020-03-19 10:44 上午 * @since 2020-03-19 10:44 上午
*/ */
@EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("li_seckill") @TableName("li_seckill")
@ApiModel(value = "秒杀活动活动") @ApiModel(value = "秒杀活动活动")

2
framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java
View File

@ -5,6 +5,7 @@ import cn.lili.mybatis.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import java.util.Date; import java.util.Date;
@ -15,6 +16,7 @@ import java.util.Date;
* @author Chopper * @author Chopper
* @since 2020-03-19 10:44 上午 * @since 2020-03-19 10:44 上午
*/ */
@EqualsAndHashCode(callSuper = true)
@Data @Data
public class BasePromotion extends BaseEntity { public class BasePromotion extends BaseEntity {