From 398e4a9bdfcaced43b304fd25d8e78b0f1096416 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 30 May 2020 22:47:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E9=97=A8=E5=BA=97][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxCouponController.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 7f35457d3..01ba206ce 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -145,13 +145,6 @@ public class WxCouponController extends BaseController { couponCVo.setCouponId(cc.getCouponId()); couponCVo.setRemainInventory(c.getRemainInventory()); couponCVo.setStatus(c.getStatus()); - - Map param = new HashMap(); - param.put("productId", cc.getCouponId()); - List chantlist = merchantService.findMerchantVoList(param); - if (null != chantlist && chantlist.size()>0) { - couponCVo.setMerchantVoList(chantlist); - } return couponCVo; } @@ -175,6 +168,13 @@ public class WxCouponController extends BaseController { wxcv.setBeginTime(cc.getBeginTime()); wxcv.setEndTime(cc.getEndTime()); wxcv.setQrCode(cc.getQrCode()); + + Map param = new HashMap(); + param.put("productId", cc.getCouponId()); + List chantlist = merchantService.findMerchantVoList(param); + if (null != chantlist && chantlist.size()>0) { + wxcv.setMerchantVoList(chantlist); + } return wxcv; }