|
|
|
@@ -2,6 +2,9 @@ package com.iformall.controller; |
|
|
|
|
|
|
|
import java.lang.reflect.InvocationTargetException; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.concurrent.TimeUnit; |
|
|
|
|
|
|
|
import org.apache.commons.beanutils.BeanUtils; |
|
|
|
@@ -21,10 +24,12 @@ import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.WxCoupon; |
|
|
|
import com.iformall.domain.po.WxCouponChannel; |
|
|
|
import com.iformall.domain.vo.WxCouponCVo; |
|
|
|
import com.iformall.domain.vo.WxMerchantVo; |
|
|
|
import com.iformall.enums.EnumCouponChannelActivityStatus; |
|
|
|
import com.iformall.enums.EnumCouponChannelType; |
|
|
|
import com.iformall.service.WxCouponChannelService; |
|
|
|
import com.iformall.service.WxCouponService; |
|
|
|
import com.iformall.service.WxMerchantService; |
|
|
|
import com.iformall.utils.Constant; |
|
|
|
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
@@ -42,6 +47,8 @@ public class WxCouponController extends BaseController { |
|
|
|
private WxCouponChannelService wxCouponChannelService; |
|
|
|
@Autowired |
|
|
|
private WxCouponService couponService; |
|
|
|
@Autowired |
|
|
|
private WxMerchantService merchantService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
@Qualifier("couponDetailRedisTemplate") |
|
|
|
@@ -138,6 +145,13 @@ 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<WxMerchantVo> chantlist = merchantService.findMerchantVoList(param); |
|
|
|
if (null != chantlist && chantlist.size()>0) { |
|
|
|
couponCVo.setMerchantVoList(chantlist); |
|
|
|
} |
|
|
|
return couponCVo; |
|
|
|
} |
|
|
|
|
|
|
|
|