From a37e91cc9f0d1f4c6d5d992b5bd13d60c5154684 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 4 Jun 2020 07:10:45 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8][=E6=96=B0=E5=A2=9E]:=E5=88=B8?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AF=8C=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponController.java | 2 +- .../controller/WxCouponOrderController.java | 2 +- .../controller/WxCouponOrderController.java | 44 +++++++++++++++++++ 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index cf89ae966..b30fc1625 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -360,7 +360,7 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) @SystemControllerLog(description = "券投放-富文本获取") public ResultData getHtml(@RequestParam Long id) { - logger.debug("[" + getIpAddr() + "] WxCouponController::findById"); + logger.debug("[" + getIpAddr() + "] WxCouponController::getHtmlById"); return new ResultData(wxCouponService.getHtmlById(id)); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 6588a09d9..d142934a8 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -212,7 +212,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } } else { - WxCoupon wxCoupon = wxCouponService.getById(wxCouponOrderCVo.getCouponId()); + WxCoupon wxCoupon = wxCouponService.getHtmlById(wxCouponOrderCVo.getCouponId()); if (wxCoupon == null) { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index a79621a9d..e360fbb04 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.RedisCache; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCUser; +import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.base.TenantEntity; @@ -163,6 +164,49 @@ public class WxCouponOrderController extends BaseController { return new ResultData(wxCouponOrderCVo); } + @ApiOperation(value = "卡券富文本接口") + @GetMapping("html") + @ApiImplicitParams({ + @ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "string", paramType = "query", required = true) + }) + public ResultData getHtml(String couponOrderId) { + if (couponOrderId == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + WxCouponOrderCVo wxCouponOrderCVo = null; + try { + wxCouponOrderCVo = wxCouponOrderService.simpleDetailCUserVo(couponOrderId); + } catch (Exception e) { + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + } + if (wxCouponOrderCVo == null) { + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + } + WxCouponCVo wxCouponCVo = null; + String key = "ch:" + wxCouponOrderCVo.getCouponId(); + ValueOperations operations = cdRedisTemplate.opsForValue(); + // 缓存 + boolean hasKey = cdRedisTemplate.hasKey(key); + if (hasKey) { + // 从缓存获取用户信息 + wxCouponCVo = operations.get(key); + if (wxCouponCVo == null) { + return new ResultData(ErrorCode.COUPON_IS_EMPTY); + } + } else { + WxCoupon wxCoupon = wxCouponService.getHtmlById(wxCouponOrderCVo.getCouponId()); + if (wxCoupon == null) { + return new ResultData(ErrorCode.COUPON_IS_EMPTY); + } + wxCouponCVo = new WxCouponCVo(); + wxCouponCVo.setId(wxCouponOrderCVo.getCouponId()); + wxCouponCVo.setHtml(wxCoupon.getHtml()); + // 插入缓存 + operations.set(key, wxCouponCVo, 3600, TimeUnit.SECONDS); + } + return new ResultData(wxCouponOrderCVo); + } + @ApiOperation(value = "卡券状态接口") @GetMapping("getStatus") @ApiImplicitParams({