|
|
|
@@ -5,8 +5,10 @@ import com.iformall.annotation.SystemControllerLog; |
|
|
|
import com.iformall.annotation.TenantIgnore; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.controller.base.BaseController; |
|
|
|
import com.iformall.domain.po.WxCouponChannel; |
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
|
import com.iformall.domain.vo.WxOrderGroupMarketing; |
|
|
|
import com.iformall.service.WxCouponChannelService; |
|
|
|
import com.iformall.service.WxMallService; |
|
|
|
import com.iformall.service.WxOrderGroupService; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
@@ -36,6 +38,8 @@ public class WxOrderGroupController extends BaseController { |
|
|
|
WxOrderGroupService wxOrderGroupService; |
|
|
|
@Autowired |
|
|
|
WxMallService wxMallService; |
|
|
|
@Autowired |
|
|
|
private WxCouponChannelService wxCouponChannelService; |
|
|
|
|
|
|
|
@TenantIgnore |
|
|
|
@ApiOperation(value = "拼团营销分析") |
|
|
|
@@ -50,6 +54,17 @@ public class WxOrderGroupController extends BaseController { |
|
|
|
TenantEntity tenantEntity = getTenantInfo(); |
|
|
|
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); |
|
|
|
wxOrderGroupMarketing.updateTenantInfo(tenantEntity); |
|
|
|
|
|
|
|
WxCouponChannel couponChannelQ = new WxCouponChannel(); |
|
|
|
couponChannelQ.updateTenantInfo(tenantEntity); |
|
|
|
couponChannelQ.setStartdate(wxOrderGroupMarketing.getStartdate()); |
|
|
|
couponChannelQ.setEnddate(wxOrderGroupMarketing.getEnddate()); |
|
|
|
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); |
|
|
|
if (null != couponIds && couponIds.size() > 0 ) { |
|
|
|
wxOrderGroupMarketing.setCouponIdList(couponIds); |
|
|
|
}else { |
|
|
|
wxOrderGroupMarketing.setCouponId("-1"); |
|
|
|
} |
|
|
|
final PageInfo<WxOrderGroupMarketing> page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing,tenantEntitys, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|