From 4cc46e20f5c93ff8c93aec2c25a9e3cdc86b680d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 17 Jun 2020 00:11:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E7=A0=81html][=E4=BF=AE=E6=94=B9]:B?= =?UTF-8?q?=E7=AB=AFhtml=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCouponOrderController.java | 2 ++ .../src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 894cfc71d..4c0db6958 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -212,6 +212,7 @@ public class WxCouponOrderController extends BaseController { if (wxCouponCVo == null) { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } + wxCouponOrderCVo.setHtml(wxCouponCVo.getHtml()); } else { WxCoupon wxCoupon = wxCouponService.getHtmlById(wxCouponOrderCVo.getCouponId()); if (wxCoupon == null) { @@ -220,6 +221,7 @@ public class WxCouponOrderController extends BaseController { wxCouponCVo = new WxCouponCVo(); wxCouponCVo.setId(wxCouponOrderCVo.getCouponId()); wxCouponCVo.setHtml(wxCoupon.getHtml()); + wxCouponOrderCVo.setHtml(wxCouponCVo.getHtml()); // 插入缓存 operations.set(key, wxCouponCVo, 3600, TimeUnit.SECONDS); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index 0b9dd2b51..79cfcdffb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -72,6 +72,8 @@ public class WxCouponOrderCVo extends WxCouponOrder { private Date validEndDate; @io.swagger.annotations.ApiModelProperty(value="内容类型(0:小程序页面类型,1:富文本类型)",name="contentType") private Integer contentType; + @io.swagger.annotations.ApiModelProperty(value="富文本内容",name="html") + private String html; /**发券商户信息*/ @io.swagger.annotations.ApiModelProperty(value="商户名",name="name")