|
|
|
@@ -223,13 +223,16 @@ public class WxCouponController extends BaseController { |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
WxCoupon c = couponService.getById(cc.getCouponId(),cc.getTenantId()); |
|
|
|
if (c == null) { |
|
|
|
c = new WxCoupon(); |
|
|
|
// WxCoupon c = couponService.getById(cc.getCouponId(),cc.getTenantId()); |
|
|
|
// if (c == null) { |
|
|
|
// c = new WxCoupon(); |
|
|
|
// } |
|
|
|
WxCouponCVo wxcv = couponService.getVoById(cc.getCouponId(),cc.getTenantId()); |
|
|
|
if(wxcv == null){ |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
WxCouponCVo wxcv = new WxCouponCVo(); |
|
|
|
BeanUtils.copyProperties(wxcv, c); |
|
|
|
// WxCouponCVo wxcv = new WxCouponCVo(); |
|
|
|
// BeanUtils.copyProperties(wxcv, c); |
|
|
|
wxcv.setId(cc.getId()); |
|
|
|
wxcv.setCouponId(cc.getCouponId()); |
|
|
|
wxcv.setTargetAd(cc.getTargetAd()); |
|
|
|
@@ -237,10 +240,10 @@ public class WxCouponController extends BaseController { |
|
|
|
wxcv.setEndTime(cc.getEndTime()); |
|
|
|
wxcv.setQrCode(cc.getQrCode()); |
|
|
|
|
|
|
|
List<WxMerchantVo> chantlist = merchantService.findMerchantVoList(cc.getCouponId(),cc.getTenantId()); |
|
|
|
if (null != chantlist && chantlist.size()>0) { |
|
|
|
wxcv.setMerchantVoList(chantlist); |
|
|
|
} |
|
|
|
// List<WxMerchantVo> chantlist = merchantService.findMerchantVoList(cc.getCouponId(),cc.getTenantId()); |
|
|
|
// if (null != chantlist && chantlist.size()>0) { |
|
|
|
// wxcv.setMerchantVoList(chantlist); |
|
|
|
// } |
|
|
|
return wxcv; |
|
|
|
} |
|
|
|
|
|
|
|
|