From 3b0f7bfc0ddaf644802cb21a52fa3439d654ddf4 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 5 Jan 2023 01:09:37 +0800 Subject: [PATCH] fix bug --- .../controller/market/WxCouponController.java | 13 +++++++++++++ .../controller/market/WxOrderGroupController.java | 15 +++++++++++++++ .../iformall/domain/vo/WxOrderGroupMarketing.java | 15 +++++++++++++++ .../iformall/service/impl/WxChartServiceImpl.java | 6 +++++- .../main/resources/mapper/WxOrderGroupMapper.xml | 8 ++++++++ 5 files changed, 56 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index e149b5160..87dca425a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -596,6 +596,19 @@ public class WxCouponController extends BaseController { List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); wxCoupon.updateTenantInfo(tenantEntity); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); + + //根据上架时间查询券 + WxCouponChannel couponChannelQ = new WxCouponChannel(); + couponChannelQ.updateTenantInfo(tenantEntity); + couponChannelQ.setStartdate(wxCoupon.getStartdate()); + couponChannelQ.setEnddate(wxCoupon.getEnddate()); + List couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); + if (null != couponIds && couponIds.size() > 0 ) { + wxCoupon.setIds(couponIds); + }else { + wxCoupon.setId(-1L); + } + PageInfo pages = wxCouponService.findPressData(wxCoupon,tenantEntitys,pageNum,pageSize); return new ResultData(pages); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java index eed435a34..561d1db5b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java @@ -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 tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); wxOrderGroupMarketing.updateTenantInfo(tenantEntity); + + WxCouponChannel couponChannelQ = new WxCouponChannel(); + couponChannelQ.updateTenantInfo(tenantEntity); + couponChannelQ.setStartdate(wxOrderGroupMarketing.getStartdate()); + couponChannelQ.setEnddate(wxOrderGroupMarketing.getEnddate()); + List couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); + if (null != couponIds && couponIds.size() > 0 ) { + wxOrderGroupMarketing.setCouponIdList(couponIds); + }else { + wxOrderGroupMarketing.setCouponId("-1"); + } final PageInfo page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing,tenantEntitys, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java index 5b19e5715..817a359f1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java @@ -1,5 +1,9 @@ package com.iformall.domain.vo; +import java.util.Date; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.base.TenantEntity; import cn.afterturn.easypoi.excel.annotation.Excel; @@ -44,5 +48,16 @@ public class WxOrderGroupMarketing extends TenantEntity { @Excel(name="参与人次",width = 20,orderNum = "10") private String totalPeople; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="查询-起始时间",name="startdate") + private Date startdate; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") + private Date enddate; + + @TableField(exist = false) + private List couponIdList; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index efc313c63..6d585b8c2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -234,7 +234,11 @@ public class WxChartServiceImpl implements WxChartDataService { String tenantId = paramsMap.get("tenantId"); String parentTenantId = paramsMap.get("parentTenantId"); Integer chart = Integer.valueOf(paramsMap.get("chart")); - Integer chartByArea = Integer.valueOf(paramsMap.get("chartByArea")); + String _chartByAreaStr = paramsMap.get("chartByArea"); + Integer chartByArea = null; + if (!StringUtils.isBlank(_chartByAreaStr)){ + chartByArea = Integer.valueOf(_chartByAreaStr); + } String startdate = paramsMap.get("startdate"); String enddate = paramsMap.get("enddate"); diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index 6a9015bef..4ff25264f 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -147,6 +147,14 @@ and c.coupon_id=#{marketing.couponId} + + + and c.coupon_id in + + #{cidItem} + + + and c.title like concat('%',#{marketing.title},'%')