供应商结算明细优化

Cui Zhi Feng

2024-09-25 debf2b9164ab65ff3ff72845d057e73f5a7e13af

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

@@ -53,16 +53,29 @@
    @Autowired
   CustomerMapper customerMapper;

    @GetMapping("/home/list")
//    @GetMapping("/home/list")
//    @ApiOperation(value = "查询-首页弹框", notes = "查询-首页弹框")
//    public ResponseEntity<ReturnDataDTO<Page<CouponTemplateVO>>> homeList(QueryActivityEffectCouponDTO dto) {
//        // 活动优惠券
//        dto.setCategory(CouponCategoryEnum.ACTIVITY.getStatus());
//        // 已经发布
//        dto.setStatus(CouponStatusEnum.ACTIVE.getStatus());
//        // 首页弹窗
//        dto.setGetType(CouponGetTypeEnum.HOME.getType());
//        return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getActivityEffectList(dto), CouponTemplateAppVO.class));
//    }

    @GetMapping("/home/alert")
    @ApiOperation(value = "查询-首页弹框", notes = "查询-首页弹框")
    public ResponseEntity<ReturnDataDTO<Page<CouponTemplateVO>>> homeList(QueryActivityEffectCouponDTO dto) {
    public ResponseEntity<ReturnDataDTO<CouponTemplateVO>> homeAlert(QueryActivityEffectCouponDTO dto) {
        // 活动优惠券
        dto.setCategory(CouponCategoryEnum.ACTIVITY.getStatus());
        // 已经发布
        dto.setStatus(CouponStatusEnum.ACTIVE.getStatus());
        // 首页弹窗
        dto.setGetType(CouponGetTypeEnum.HOME.getType());
        return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getActivityEffectList(dto), CouponTemplateAppVO.class));
        // 如果当前人员已经领取过的话，则不返回
        return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(couponTemplateService.getHomeActivityEffectAlert(dto), CouponTemplateAppVO.class));
    }

    @GetMapping("/activy/list")