From f9431377bf6d9c41601659d843127e8d6f57eb08 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Tue, 13 Dec 2022 15:14:19 +0800 Subject: [PATCH] fix bug --- .../controller/WxCouponController.java | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index bb0eda22a..74bb1403f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -317,7 +317,7 @@ public class WxCouponController extends BaseController { CouponCacheUtils.setCouponChannelCache(redisTemplate, couponChannelIdL, couponChannel); } - Map> volist = CouponCacheUtils.getCouponMerchantCache(redisTemplate, couponChannel.getId()); + Map> volist = CouponCacheUtils.getCouponMerchantCache(redisTemplate, couponChannel.getCouponId()); if (null == volist) { volist = couponService.getCouponMerchantList(getTenantInfo(), couponChannel.getCouponId()); if (null != volist && volist.size() > 0 ) { @@ -327,6 +327,42 @@ public class WxCouponController extends BaseController { return new ResultData(volist); } + + @TenantIgnore + @ApiOperation("根据couponId查询商品商户接口") + @GetMapping("/couponMerchantByCouponId") + @ApiImplicitParams({ + @ApiImplicitParam(name = "couponId", value = "couponId", dataType = "String", paramType = "query", required = true)}) + public ResultData couponMerchantByCouponId(String couponId) { + if ((StringUtils.isBlank(couponId) || couponId.equalsIgnoreCase(Constant.UNDEFINED)) + ) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId为空"); + } + Long couponIdL = 0L; + + try { + if (StringUtils.isNotBlank(couponId) && !couponId.equalsIgnoreCase(Constant.UNDEFINED)) { + couponIdL = Long.valueOf(couponId); + } + } catch (NumberFormatException e) { + logger.error("id转换失败" + couponId); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId转换失败" + couponId); + } + + if(couponIdL <= 0){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId为空"); + } + + Map> volist = CouponCacheUtils.getCouponMerchantCache(redisTemplate, couponIdL); + if (null == volist) { + volist = couponService.getCouponMerchantList(getTenantInfo(), couponIdL); + if (null != volist && volist.size() > 0 ) { + CouponCacheUtils.setCouponMerchantCache(redisTemplate, couponIdL, volist); + } + } + return new ResultData(volist); + + } @Deprecated @ApiOperation("根据id(couponChannel)查询接口")