Merge remote-tracking branch 'origin/master-v2' into master-v2

gongzuming

2024-09-02 a92e296c28d4c09055f53293378da001117ec979

 src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java

@@ -7,10 +7,12 @@
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;
import com.mzl.flower.enums.CouponCategoryEnum;
import com.mzl.flower.enums.CouponStatusEnum;
import com.mzl.flower.enums.CouponTypeEnum;
import com.mzl.flower.enums.CouponUsageTypeEnum;
import com.mzl.flower.service.coupon.CouponTemplateService2;
@@ -186,8 +188,27 @@
    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(QueryActivePointCouponDTO dto) {
        // 设置只查询积分优惠券的
        dto.setCategory(CouponCategoryEnum.POINT.getStatus());
        dto.setStatus(CouponStatusEnum.ACTIVE.getStatus());
        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));
    }


@@ -212,4 +233,15 @@


    }



    @PostMapping("/exchange")
    @ApiOperation(value = "小程序-积分优惠券兑换", notes = "小程序-积分优惠券兑换")
    public ResponseEntity<ReturnDataDTO> exchangeCoupon(@Validated @RequestBody ExchangeCouponDTO dto) {
        couponTemplateService.exchangeCoupon(dto);
        return returnData(R.SUCCESS.getCode(), null);


    }
}