|
|
|
@@ -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); |
|
|
|
} |
|
|
|
|