diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index c566d748e..4b264c6bf 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -7,7 +7,9 @@ import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.EnumCouponChannelActivityStatus; import com.iformall.enums.EnumCouponChannelStatus; import com.iformall.enums.EnumCouponChannelType; +import com.iformall.service.WxMerchantService; import io.swagger.annotations.Api; +import org.apache.commons.collections.map.HashedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +24,8 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import java.util.Date; +import java.util.HashMap; +import java.util.Map; @RestController @RequestMapping("/api/wxCouponChannel") @@ -32,6 +36,9 @@ public class WxCouponChannelController extends BaseController { @Autowired private WxCouponChannelService wxCouponChannelService; + @Autowired + private WxMerchantService wxMerchantService; + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -59,9 +66,17 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC); + Map map = new HashedMap(); PageInfo page = wxCouponChannelService.listByMerchant(wxCouponChannel,pageNum,pageSize); filterTimed(wxCouponChannel, page); - return new ResultData(page); + + if(wxCouponChannel.getMerchantId() != null){ + WxMerchant wm = wxMerchantService.getById(wxCouponChannel.getMerchantId()); + map.put("qrCode",wm.getQrCode()); + } + + map.put("page",page); + return new ResultData(map); } private void filterTimed(WxCouponChannel wxCouponChannel, PageInfo page) {