海恒-鸿瑞堂
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Pu Zhibing
2 天以前 af6456c60aa0d3cc931d3c85f652fa7e47d003e3 
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java


@@ -7,10 +7,7 @@


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.domain.vo.*;


import com.ruoyi.member.service.coupon.CouponService;


import com.ruoyi.member.service.member.MemberCouponService;


import com.ruoyi.system.api.domain.dto.MerBaseDto;


@@ -19,10 +16,7 @@


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;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RequestMethod;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


import java.util.List;


@@ -127,4 +121,12 @@


        MetAuditCouponTotalVo auditCouponTotalVo = couponService.getMetAuditCouponTotal(merBaseDto.getShopId());


        return R.ok(auditCouponTotalVo);


    }




    //获取商户抽奖类型优惠券列表


    @RequestMapping(value = "/getLotteryEventCouponListByShopId/{shopId}", method = RequestMethod.POST)


    @ApiOperation(value = "获取商户抽奖类型优惠券列表【2.0】")


    public R<List<LotteryEventCouponListVO>> getLotteryEventCouponListByShopId(@PathVariable(value = "shopId") String shopId) {


        return R.ok( couponService.getLotteryEventCouponListByShopId(shopId));


    }




}