From a3c557b7f4cf55d934c4c064d70f2d6ae2cb80cb Mon Sep 17 00:00:00 2001 From: macro Date: Sat, 27 Jun 2020 10:32:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UmsMemberCouponController.java | 25 ++++++++++++++++--- .../mall/portal/dao/SmsCouponHistoryDao.java | 3 +++ .../service/UmsMemberCouponService.java | 16 +++++++++--- .../resources/dao/SmsCouponHistoryDao.xml | 17 +++++++++++++ 4 files changed, 55 insertions(+), 6 deletions(-) diff --git a/mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberCouponController.java b/mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberCouponController.java index 3a395a3..f28c7d7 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberCouponController.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/controller/UmsMemberCouponController.java @@ -1,6 +1,7 @@ package com.macro.mall.portal.controller; import com.macro.mall.common.api.CommonResult; +import com.macro.mall.model.SmsCoupon; import com.macro.mall.model.SmsCouponHistory; import com.macro.mall.portal.domain.CartPromotionItem; import com.macro.mall.portal.domain.SmsCouponHistoryDetail; @@ -39,14 +40,24 @@ public class UmsMemberCouponController { return CommonResult.success(null,"领取成功"); } + @ApiOperation("获取用户优惠券历史列表") + @ApiImplicitParam(name = "useStatus", value = "优惠券筛选类型:0->未使用；1->已使用；2->已过期", + allowableValues = "0,1,2", paramType = "query", dataType = "integer") + @RequestMapping(value = "/listHistory", method = RequestMethod.GET) + @ResponseBody + public CommonResult> listHistory(@RequestParam(value = "useStatus", required = false) Integer useStatus) { + List couponHistoryList = memberCouponService.listHistory(useStatus); + return CommonResult.success(couponHistoryList); + } + @ApiOperation("获取用户优惠券列表") @ApiImplicitParam(name = "useStatus", value = "优惠券筛选类型:0->未使用；1->已使用；2->已过期", allowableValues = "0,1,2", paramType = "query", dataType = "integer") @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody - public CommonResult> list(@RequestParam(value = "useStatus", required = false) Integer useStatus) { - List couponHistoryList = memberCouponService.list(useStatus); - return CommonResult.success(couponHistoryList); + public CommonResult> list(@RequestParam(value = "useStatus", required = false) Integer useStatus) { + List couponList = memberCouponService.list(useStatus); + return CommonResult.success(couponList); } @ApiOperation("获取登录会员购物车的相关优惠券") @@ -59,4 +70,12 @@ public class UmsMemberCouponController { List couponHistoryList = memberCouponService.listCart(cartPromotionItemList, type); return CommonResult.success(couponHistoryList); } + + @ApiOperation("获取当前商品相关优惠券") + @RequestMapping(value = "/listByProduct/{productId}", method = RequestMethod.GET) + @ResponseBody + public CommonResult> listByProduct(@PathVariable Long productId) { + List couponHistoryList = memberCouponService.listByProduct(productId); + return CommonResult.success(couponHistoryList); + } } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/dao/SmsCouponHistoryDao.java b/mall-portal/src/main/java/com/macro/mall/portal/dao/SmsCouponHistoryDao.java index 06b687c..238010e 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/dao/SmsCouponHistoryDao.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/dao/SmsCouponHistoryDao.java @@ -1,6 +1,8 @@ package com.macro.mall.portal.dao; +import com.macro.mall.model.SmsCoupon; import com.macro.mall.portal.domain.SmsCouponHistoryDetail; +import io.swagger.models.auth.In; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,4 +13,5 @@ import java.util.List; */ public interface SmsCouponHistoryDao { List getDetailList(@Param("memberId") Long memberId); + List getCouponList(@Param("memberId") Long memberId, @Param("useStatus")Integer useStatus); } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/UmsMemberCouponService.java b/mall-portal/src/main/java/com/macro/mall/portal/service/UmsMemberCouponService.java index a34a1db..44ada98 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/UmsMemberCouponService.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/UmsMemberCouponService.java @@ -1,5 +1,6 @@ package com.macro.mall.portal.service; +import com.macro.mall.model.SmsCoupon; import com.macro.mall.model.SmsCouponHistory; import com.macro.mall.portal.domain.CartPromotionItem; import com.macro.mall.portal.domain.SmsCouponHistoryDetail; @@ -19,13 +20,22 @@ public interface UmsMemberCouponService { void add(Long couponId); /** - * 获取优惠券列表 - * @param useStatus 优惠券的使用状态 + * 获取优惠券历史列表 */ - List list(Integer useStatus); + List listHistory(Integer useStatus); /** * 根据购物车信息获取可用优惠券 */ List listCart(List cartItemList, Integer type); + + /** + * 获取当前商品相关优惠券 + */ + List listByProduct(Long productId); + + /** + * 获取用户优惠券列表 + */ + List list(Integer useStatus); } diff --git a/mall-portal/src/main/resources/dao/SmsCouponHistoryDao.xml b/mall-portal/src/main/resources/dao/SmsCouponHistoryDao.xml index 895f22f..28c19a4 100644 --- a/mall-portal/src/main/resources/dao/SmsCouponHistoryDao.xml +++ b/mall-portal/src/main/resources/dao/SmsCouponHistoryDao.xml @@ -33,4 +33,21 @@ WHERE ch.member_id = #{memberId} AND ch.use_status = 0 + + \ No newline at end of file