src/main/java/com/mzl/flower/dto/request/coupon/QueryActivePointCouponDTO.java
对比新文件 @@ -0,0 +1,26 @@ package com.mzl.flower.dto.request.coupon; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class QueryActivePointCouponDTO{ @ApiModelProperty(value = "排序列 point desc / create_time desc,默认 create_time desc") private String orderStr; @ApiModelProperty(value = "积分最小值") private Integer minPoint; @ApiModelProperty(value = "积分最大值") private Integer maxPoint; @ApiModelProperty(value = "优惠券种类",hidden = true) private String category; @ApiModelProperty(value = "优惠券状态",hidden = true) private String status; } src/main/java/com/mzl/flower/dto/response/coupon/CouponPointStatisVO.java
对比新文件 @@ -0,0 +1,18 @@ package com.mzl.flower.dto.response.coupon; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class CouponPointStatisVO { @ApiModelProperty(value = "优惠券总数") private Integer totalAmount; @ApiModelProperty(value = "本月兑换优惠券总数") private Integer curMonExchangeAmount; @ApiModelProperty(value = "本月兑换积分总数") private Integer curMonExchangePointAmount; } src/main/java/com/mzl/flower/mapper/coupon/CouponRecordMapperCustom.java
@@ -24,9 +24,9 @@ List<CouponRecordVO> getList(@Param("param") QueryCouponRecordDTO dto); int statisCouponTemplateCount(@Param("param") QueryCouponStatisticsBO queryCouponStatisticsBO); Integer statisCouponTemplateCount(@Param("param") QueryCouponStatisticsBO queryCouponStatisticsBO); int statisCouponTemplateCurMonCount(@Param("param") QueryCouponStatisticsBO queryCouponStatisticsBO); Integer statisCouponTemplateCurMonCount(@Param("param") QueryCouponStatisticsBO queryCouponStatisticsBO); int statisCouponPointCurMonPointAmonut(@Param("param") QueryCouponStatisticsBO queryCouponStatisticsBO); Integer statisCouponPointCurMonPointAmonut(@Param("param") QueryCouponStatisticsBO queryCouponStatisticsBO); } src/main/java/com/mzl/flower/mapper/coupon/CouponTemplateMapperCustom.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mzl.flower.dto.request.coupon.BatchCouponTemplateDTO; import com.mzl.flower.dto.request.coupon.QueryActivePointCouponDTO; import com.mzl.flower.dto.request.coupon.QueryCouponDTO; import com.mzl.flower.dto.response.coupon.CouponTemplateVO; import com.mzl.flower.entity.coupon.CouponTemplateDO; @@ -42,4 +43,7 @@ int expireBatchCouponTemplate(@Param("param") BatchCouponTemplateDTO dto); List<CouponTemplateVO> getCouponPointList(@Param("param") QueryActivePointCouponDTO dto); Page<CouponTemplateVO> getPointPage(Page page,@Param("param") QueryActivePointCouponDTO dto); } src/main/java/com/mzl/flower/service/coupon/CouponRecordService.java
@@ -45,11 +45,11 @@ */ boolean expiredCouponRecordByListCurMonth(); int statisCouponTemplateCount(QueryCouponStatisticsBO queryCouponStatisticsBO); Integer statisCouponTemplateCount(QueryCouponStatisticsBO queryCouponStatisticsBO); int statisCouponTemplateCurMonCount(QueryCouponStatisticsBO queryCouponStatisticsBO); Integer statisCouponTemplateCurMonCount(QueryCouponStatisticsBO queryCouponStatisticsBO); int statisCouponPointCurMonPontAmonut(QueryCouponStatisticsBO queryCouponStatisticsBO); Integer statisCouponPointCurMonPontAmonut(QueryCouponStatisticsBO queryCouponStatisticsBO); /** * 根据优惠券种类，优惠券ID，用户的ID查找优惠券的记录数量 src/main/java/com/mzl/flower/service/coupon/CouponTemplateService2.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.mzl.flower.dto.request.coupon.*; import com.mzl.flower.dto.response.coupon.CouponPointStatisVO; import com.mzl.flower.dto.response.coupon.CouponTemplateVO; import com.mzl.flower.entity.coupon.CouponTemplateDO; @@ -59,8 +60,25 @@ /** * 积分统计 * * @param queryCouponStatisticsBO * @return */ CouponTemplateVO statisCouponTemplatePoint(QueryCouponStatisticsBO queryCouponStatisticsBO); CouponPointStatisVO statisCouponTemplatePoint(QueryCouponStatisticsBO queryCouponStatisticsBO); /** * 积分优惠券全部 * @param dto * @return */ List<CouponTemplateVO> getPointList(QueryActivePointCouponDTO dto); /** * 积分优惠券列表 * @param page * @param dto * @return */ Page<CouponTemplateVO> getPointPage(Page page, QueryActivePointCouponDTO dto); } src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java
@@ -284,16 +284,16 @@ } @Override public int statisCouponTemplateCount(QueryCouponStatisticsBO queryCouponStatisticsBO) { public Integer statisCouponTemplateCount(QueryCouponStatisticsBO queryCouponStatisticsBO) { return couponRecordMapperCustom.statisCouponTemplateCount(queryCouponStatisticsBO); } @Override public int statisCouponTemplateCurMonCount(QueryCouponStatisticsBO queryCouponStatisticsBO) { public Integer statisCouponTemplateCurMonCount(QueryCouponStatisticsBO queryCouponStatisticsBO) { return couponRecordMapperCustom.statisCouponTemplateCurMonCount(queryCouponStatisticsBO); } @Override public int statisCouponPointCurMonPontAmonut(QueryCouponStatisticsBO queryCouponStatisticsBO) { public Integer statisCouponPointCurMonPontAmonut(QueryCouponStatisticsBO queryCouponStatisticsBO) { return couponRecordMapperCustom.statisCouponPointCurMonPointAmonut(queryCouponStatisticsBO); }
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mzl.flower.config.security.SecurityUtils; import com.mzl.flower.dto.request.coupon.*; import com.mzl.flower.dto.response.coupon.CouponPointStatisVO; import com.mzl.flower.dto.response.coupon.CouponTemplateVO; import com.mzl.flower.entity.coupon.CouponRecordDO; import com.mzl.flower.entity.coupon.CouponTemplateCustomerDO; @@ -295,17 +296,31 @@ } @Override public CouponTemplateVO statisCouponTemplatePoint(QueryCouponStatisticsBO queryCouponStatisticsBO) { //TODO 优惠券总数 couponRecordService.statisCouponTemplateCount(queryCouponStatisticsBO); //TODO 本月兑换优惠券总数 couponRecordService.statisCouponTemplateCurMonCount(queryCouponStatisticsBO); //TODO 本月兑换积分总数 couponRecordService.statisCouponPointCurMonPontAmonut(queryCouponStatisticsBO); return null; public CouponPointStatisVO statisCouponTemplatePoint(QueryCouponStatisticsBO queryCouponStatisticsBO) { CouponPointStatisVO vo=new CouponPointStatisVO(); //优惠券总数 vo.setTotalAmount(couponRecordService.statisCouponTemplateCount(queryCouponStatisticsBO)); // 本月兑换优惠券总数 vo.setCurMonExchangeAmount(couponRecordService.statisCouponTemplateCurMonCount(queryCouponStatisticsBO)); // 本月兑换积分总数 vo.setCurMonExchangePointAmount(couponRecordService.statisCouponPointCurMonPontAmonut(queryCouponStatisticsBO)); return vo; } @Override public List<CouponTemplateVO> getPointList(QueryActivePointCouponDTO dto) { if(StringUtils.isBlank(dto.getOrderStr())){ dto.setOrderStr(" create_time desc "); } return couponTemplateMapperCustom.getCouponPointList(dto); } @Override public Page<CouponTemplateVO> getPointPage(Page page, QueryActivePointCouponDTO dto) { if(StringUtils.isBlank(dto.getOrderStr())){ dto.setOrderStr(" create_time desc "); } return couponTemplateMapperCustom.getPointPage(page,dto); } } src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java
@@ -7,6 +7,7 @@ import com.mzl.flower.base.ReturnDataDTO; import com.mzl.flower.config.exception.ValidationException; import com.mzl.flower.dto.request.coupon.*; import com.mzl.flower.dto.response.coupon.CouponPointStatisVO; import com.mzl.flower.dto.response.coupon.CouponTemplatePointVO; import com.mzl.flower.dto.response.coupon.CouponTemplateVO; import com.mzl.flower.entity.coupon.CouponTemplateDO; @@ -187,20 +188,30 @@ public ResponseEntity<ReturnDataDTO> statistics(QueryCouponStatisticsDTO dto) { QueryCouponStatisticsBO queryCouponStatisticsBO=new QueryCouponStatisticsBO(); BeanUtils.copyProperties(dto,queryCouponStatisticsBO); CouponTemplateVO couponTemplateVO = couponTemplateService.statisCouponTemplatePoint(queryCouponStatisticsBO); return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(couponTemplateVO, CouponTemplatePointVO.class)); CouponPointStatisVO vo = couponTemplateService.statisCouponTemplatePoint(queryCouponStatisticsBO); return returnData(R.SUCCESS.getCode(), vo); } @GetMapping("/active/list") @ApiOperation(value = "查询-全部", notes = "查询-全部") public ResponseEntity<ReturnDataDTO<Page<CouponTemplateVO>>> activelist() { public ResponseEntity<ReturnDataDTO<Page<CouponTemplateVO>>> activeList(QueryActivePointCouponDTO dto) { // 设置只查询积分优惠券的 QueryCouponDTO dto=new QueryCouponDTO(); dto.setCategory(CouponCategoryEnum.POINT.getStatus()); dto.setStatus(CouponStatusEnum.ACTIVE.getStatus()); return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getList(dto), CouponTemplatePointVO.class)); return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getPointList(dto), CouponTemplatePointVO.class)); } @GetMapping("/active/page") @ApiOperation(value = "查询-分页", notes = "查询-分页") public ResponseEntity<ReturnDataDTO<Page<CouponTemplatePointVO>>> activePage(Page page, QueryActivePointCouponDTO dto) { // 设置只查询积分优惠券的 dto.setCategory(CouponCategoryEnum.POINT.getStatus()); dto.setStatus(CouponStatusEnum.ACTIVE.getStatus()); Page<CouponTemplateVO> resultPage = couponTemplateService.getPointPage(page, dto); return returnData(R.SUCCESS.getCode(), ConverterUtil.transPage(resultPage, CouponTemplatePointVO.class)); } private void valid(CreateCouponTemplatePointDTO dto){ if (StringUtils.isNotBlank(dto.getCouponDiscountType()) src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
@@ -57,11 +57,39 @@ </update> <select id="getCouponTemplatePage" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO"> <include refid="QuerySql2"></include> <include refid="QuerySql2"/> </select> <select id="getList" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO"> <include refid="QuerySql2"></include> <include refid="QuerySql2"/> </select> <select id="getCouponPointList" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO"> <include refid="QueryPointSql" /> </select> <select id="getPointPage" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO"> <include refid="QueryPointSql" /> </select> <sql id="QueryPointSql"> select * from t_coupon_template where deleted=0 <if test="param.category != null and param.category != ''"> AND category = #{param.category} </if> <if test="param.status != null and param.status != ''"> AND status = #{param.status} </if> <if test="param.minPoint != null "> AND point >= #{param.minPoint} </if> <if test="param.maxPoint != null "> AND point <= #{param.maxPoint} </if> <if test="param.orderStr != null and param.orderStr != '' "> order by ${param.orderStr} </if> </sql> <sql id="QuerySql2"> select *
