From 9988af08726ca36cca586ac5b71589695d25b789 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 23 Dec 2022 00:51:26 +0800 Subject: [PATCH] //coupon html --- .../java/com/iformall/controller/WxCouponController.java | 6 +++++- .../com/iformall/controller/WxCouponOrderController.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 74bb1403f..e52666534 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -551,9 +551,11 @@ public class WxCouponController extends BaseController { return null; } WxCouponCVo couponCVo = new WxCouponCVo(); - couponCVo.setId(cc.getId()); +// couponCVo.setId(cc.getId()); couponCVo.setCouponId(cc.getCouponId()); + couponCVo.setContentType(c.getContentType()); couponCVo.setHtml(c.getHtml()); + couponCVo.setRemark(c.getRemark()); return couponCVo; }else if(couponIdL > 0l){ WxCoupon c = couponService.getHtmlById(couponIdL,tenantId); @@ -562,7 +564,9 @@ public class WxCouponController extends BaseController { } WxCouponCVo couponCVo = new WxCouponCVo(); couponCVo.setCouponId(c.getId()); + couponCVo.setContentType(c.getContentType()); couponCVo.setHtml(c.getHtml()); + couponCVo.setRemark(c.getRemark()); return couponCVo; } return null; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 4b6926c44..4b531f32d 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -260,16 +260,20 @@ public class WxCouponOrderController extends BaseController { } wxCouponOrderCVo.setContentType(wxCouponCVo.getContentType()); wxCouponOrderCVo.setHtml(wxCouponCVo.getHtml()); + wxCouponOrderCVo.setRemark(wxCouponCVo.getRemark()); } else { WxCoupon wxCoupon = wxCouponService.getHtmlById(wxCouponOrderCVo.getCouponId(),wxCouponOrderCVo.getTenantId()); if (wxCoupon == null) { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } wxCouponCVo = new WxCouponCVo(); - wxCouponCVo.setId(wxCouponOrderCVo.getCouponId()); + wxCouponCVo.setId(wxCoupon.getId()); + wxCouponCVo.setContentType(wxCoupon.getContentType()); wxCouponCVo.setHtml(wxCoupon.getHtml()); + wxCouponCVo.setRemark(wxCoupon.getRemark()); wxCouponOrderCVo.setContentType(wxCouponCVo.getContentType()); wxCouponOrderCVo.setHtml(wxCouponCVo.getHtml()); + wxCouponOrderCVo.setRemark(wxCouponCVo.getRemark()); // 插入缓存 operations.set(key, wxCouponCVo, 3600, TimeUnit.SECONDS); }