|
|
|
@@ -9,8 +9,10 @@ import com.simple.common.Result; |
|
|
|
import com.simple.common.ResultData; |
|
|
|
import com.simple.domain.po.WxCoupon; |
|
|
|
import com.simple.domain.po.WxCouponChannel; |
|
|
|
import com.simple.domain.po.WxMerchant; |
|
|
|
import com.simple.domain.vo.WxCouponChannelVo; |
|
|
|
import com.simple.mapper.WxCouponChannelMapper; |
|
|
|
import com.simple.mapper.WxMerchantMapper; |
|
|
|
import com.simple.service.WxCouponChannelService; |
|
|
|
import com.simple.service.WxCouponService; |
|
|
|
import org.apache.log4j.Logger; |
|
|
|
@@ -26,6 +28,8 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { |
|
|
|
WxCouponChannelMapper wxCouponChannelMapper; |
|
|
|
@Autowired |
|
|
|
WxCouponService wxCouponService; |
|
|
|
@Autowired |
|
|
|
WxMerchantMapper wxMerchantMapper; |
|
|
|
|
|
|
|
private Logger logger = Logger.getLogger(getClass()); |
|
|
|
|
|
|
|
@@ -160,6 +164,11 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { |
|
|
|
for (WxCouponChannelVo wxcouponVo:wxCouponChannelVoList) { |
|
|
|
if(couponNamesMap.get(wxcouponVo.getCouponId())!=null){ |
|
|
|
wxcouponVo.setWxCoupon(couponNamesMap.get(wxcouponVo.getCouponId())); |
|
|
|
WxMerchant wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setId(wxcouponVo.getMerchantId()); |
|
|
|
wxMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchant); |
|
|
|
if (wxMerchant != null) |
|
|
|
wxcouponVo.setWxMerchant(wxMerchant); |
|
|
|
} |
|
|
|
} |
|
|
|
return new PageInfo<>(wxCouponChannelVoList); |
|
|
|
|