diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java index 7e32b407c..dcc600da4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java @@ -5,6 +5,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.WxOrderGroup; +import com.iformall.domain.vo.WxOrderGroupMarketing; import com.iformall.enums.EnumOrderStatus; import com.iformall.service.WxCouponService; import com.iformall.service.WxOrderGroupService; @@ -122,4 +123,16 @@ public class WxOrderGroupController extends BaseController { return wxOrderGroupService.queryAttendStatus(wxOrderGroup); } + @ApiOperation(value = "拼团营销分析") + @GetMapping("queryOrderGroupMarketingList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "couponId", value = "couponId", dataType = "String", paramType = "query"), + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + public ResultData queryOrderGroupMarketingList(@ModelAttribute WxOrderGroupMarketing wxOrderGroupMarketing, Integer pageNum, Integer pageSize) { + final PageInfo page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing, 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 new file mode 100644 index 000000000..bc234bfd8 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java @@ -0,0 +1,25 @@ +package com.iformall.domain.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class WxOrderGroupMarketing implements Serializable { + private static final long serialVersionUID = 1L; + + private String tenantId; + private String couponId; + private String coverImg; + private String title; + private String price; + private String salePrice; + private String groupTotalCount; + private String groupSuccessCount; + private String groupTransferRatio; + private String successPeople; + private String verifyCount; + private String verifyRatio; + private String totalPeople; + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java index 342cdfc3b..ed4bbb8b4 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.WxOrderGroup; +import com.iformall.domain.vo.WxOrderGroupMarketing; import java.util.List; import java.util.Map; @@ -18,4 +19,17 @@ public interface WxOrderGroupMapper extends CommonMapper { int updateOrderGroup(WxOrderGroup wxOrderGroup); + List queryOrderGroupMarketingList(WxOrderGroupMarketing marketing); + + List> queryOrderGroupSuccessCountAndTime(Map params); + + List> queryOrderGroupVerifyCountAndTime(Map params); + + long queryOrderGroupCount(Map params); + + long queryOrderGroupSuccessCount(Map params); + + long queryOrderGroupPeopleCount(Map params); + } + diff --git a/mallinkService/src/main/java/com/iformall/service/WxOrderGroupService.java b/mallinkService/src/main/java/com/iformall/service/WxOrderGroupService.java index 377f724fe..2672ecd11 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOrderGroupService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOrderGroupService.java @@ -5,6 +5,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.WxOrderGroup; +import com.iformall.domain.vo.WxOrderGroupMarketing; import java.util.List; import java.util.Map; @@ -30,4 +31,6 @@ public interface WxOrderGroupService { List findList(WxOrderGroup group); + PageInfo queryOrderGroupMarketingList(WxOrderGroupMarketing marketing, Integer pageNum, Integer pageSize); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java index 1db889fc8..424465ae1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.vo.WxOrderGroupMarketing; import com.iformall.enums.EnumAppType; import com.iformall.enums.EnumCouponStatus; import com.iformall.enums.EnumOrderStatus; @@ -287,6 +288,14 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { return wxOrderGroupMapper.select(group); } + @Override + public PageInfo queryOrderGroupMarketingList(WxOrderGroupMarketing marketing, Integer pageIndex, Integer pageSize) { + PageHelper.startPage(pageIndex, pageSize); + List result = wxOrderGroupMapper.queryOrderGroupMarketingList(marketing); + PageInfo pageInfo = new PageInfo<>(result); + return pageInfo; + } + public void returnMoney(WxOrderGroup group) { //券失效或拼团超时 修改 拼团的状态 wxOrderGroupMapper.updateByPrimaryKeySelective(group); diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index 653c6873f..e72c30492 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -94,5 +94,101 @@ update wx_order_group set remain_people=remain_people-1,update_date=#{updateDate} where id=#{id} and remain_people>0 + + + + + + + + + + + + + +