| @@ -145,13 +145,6 @@ public class WxCouponController extends BaseController { | |||||
| couponCVo.setCouponId(cc.getCouponId()); | couponCVo.setCouponId(cc.getCouponId()); | ||||
| couponCVo.setRemainInventory(c.getRemainInventory()); | couponCVo.setRemainInventory(c.getRemainInventory()); | ||||
| couponCVo.setStatus(c.getStatus()); | couponCVo.setStatus(c.getStatus()); | ||||
| Map param = new HashMap(); | |||||
| param.put("productId", cc.getCouponId()); | |||||
| List<WxMerchantVo> chantlist = merchantService.findMerchantVoList(param); | |||||
| if (null != chantlist && chantlist.size()>0) { | |||||
| couponCVo.setMerchantVoList(chantlist); | |||||
| } | |||||
| return couponCVo; | return couponCVo; | ||||
| } | } | ||||
| @@ -175,6 +168,13 @@ public class WxCouponController extends BaseController { | |||||
| wxcv.setBeginTime(cc.getBeginTime()); | wxcv.setBeginTime(cc.getBeginTime()); | ||||
| wxcv.setEndTime(cc.getEndTime()); | wxcv.setEndTime(cc.getEndTime()); | ||||
| wxcv.setQrCode(cc.getQrCode()); | wxcv.setQrCode(cc.getQrCode()); | ||||
| Map param = new HashMap(); | |||||
| param.put("productId", cc.getCouponId()); | |||||
| List<WxMerchantVo> chantlist = merchantService.findMerchantVoList(param); | |||||
| if (null != chantlist && chantlist.size()>0) { | |||||
| wxcv.setMerchantVoList(chantlist); | |||||
| } | |||||
| return wxcv; | return wxcv; | ||||
| } | } | ||||