bug

jiangqs

2023-08-10 a8e56f03a22c722ccf3f67a408919e6c8f256de3

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java

@@ -5,14 +5,19 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.dto.MerCouponEditDto;
import com.ruoyi.member.domain.dto.MerCouponPageDto;
import com.ruoyi.member.domain.dto.MerGoodsCouponListDto;
import com.ruoyi.member.domain.dto.MgtCouponListDto;
import com.ruoyi.member.domain.vo.MerCouponGetVo;
import com.ruoyi.member.domain.vo.MerCouponPageVo;
import com.ruoyi.member.domain.vo.MetAuditCouponTotalVo;
import com.ruoyi.member.domain.vo.MgtCouponSimpleListVo;
import com.ruoyi.member.service.coupon.CouponService;
import com.ruoyi.member.service.member.MemberCouponService;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
import com.ruoyi.system.api.domain.dto.MerPageDto;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.vo.MerMemberCouponVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
@@ -38,6 +43,10 @@

    @Resource
    private CouponService couponService;

    @Resource
    private MemberCouponService memberCouponService;


    @RequestMapping(value = "/pagePlatformMerCoupon", method = RequestMethod.POST)
    @ApiOperation(value = "商户分页获取平台优惠券列表")
@@ -96,4 +105,27 @@
        List<MgtCouponSimpleListVo> mgtCouponSimpleListVoList = couponService.listMgtCouponSimpleVo(mgtCouponListDto);
        return R.ok(mgtCouponSimpleListVoList);
    }

    /**
     * @description: 获取用户优惠券
     * @author jqs34
     * @date 2023/5/3 1:45
     * @version 1.0
     */
    @RequestMapping(value = "/listMerShopGoodsMemberCoupon", method = RequestMethod.POST)
    @ApiOperation(value = "商户获取用户已领取优惠券")
    public R<List<MerMemberCouponVo>> listMerShopGoodsMemberCoupon(@RequestBody MerGoodsCouponListDto merGoodsCouponListDto){
        List<MerMemberCouponVo> merMemberCouponVoList = memberCouponService.listMerShopGoodsMemberCoupon(merGoodsCouponListDto);
        return R.ok(merMemberCouponVoList);
    }


    @RequestMapping(value = "/getMetAuditCouponTotal", method = RequestMethod.POST)
    @ApiOperation(value = "商户获取优惠券审核统计")
    public R<MetAuditCouponTotalVo> getMetAuditCouponTotal(@RequestBody MerBaseDto merBaseDto) {
        Long userId = SecurityUtils.getUserId();
        merBaseDto.setUserId(userId);
        MetAuditCouponTotalVo auditCouponTotalVo = couponService.getMetAuditCouponTotal(merBaseDto.getShopId());
        return R.ok(auditCouponTotalVo);
    }
}