Commit a8e8c14ab36394d0f195f3dc3e21b9d6635d4052
Committed by
Gitee
Gitee
!787 合并最新商城代码
Merge pull request !787 from 芋道源码/feature/mall_product
Showing
3 changed files
with
29 additions
and
0 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/CouponTemplateController.java
| ... | ... | @@ -16,6 +16,9 @@ import org.springframework.web.bind.annotation.*; |
| 16 | 16 | import javax.annotation.Resource; |
| 17 | 17 | import javax.validation.Valid; |
| 18 | 18 | |
| 19 | +import java.util.Collection; | |
| 20 | +import java.util.List; | |
| 21 | + | |
| 19 | 22 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 20 | 23 | |
| 21 | 24 | @Tag(name = "管理后台 - 优惠劵模板") |
| ... | ... | @@ -75,4 +78,14 @@ public class CouponTemplateController { |
| 75 | 78 | PageResult<CouponTemplateDO> pageResult = couponTemplateService.getCouponTemplatePage(pageVO); |
| 76 | 79 | return success(CouponTemplateConvert.INSTANCE.convertPage(pageResult)); |
| 77 | 80 | } |
| 81 | + | |
| 82 | + @GetMapping("/list") | |
| 83 | + @Operation(summary = "获得优惠劵模板列表") | |
| 84 | + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") | |
| 85 | + @PreAuthorize("@ss.hasPermission('promotion:coupon-template:query')") | |
| 86 | + public CommonResult<List<CouponTemplateRespVO>> getCouponTemplateList(@RequestParam("ids") Collection<Long> ids) { | |
| 87 | + List<CouponTemplateDO> list = couponTemplateService.getCouponTemplateList(ids); | |
| 88 | + return success(CouponTemplateConvert.INSTANCE.convertList(list)); | |
| 89 | + } | |
| 90 | + | |
| 78 | 91 | } | ... | ... |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponTemplateController.java
| ... | ... | @@ -69,6 +69,20 @@ public class AppCouponTemplateController { |
| 69 | 69 | return success(CouponTemplateConvert.INSTANCE.convertAppList(list, canCanTakeMap)); |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | + @GetMapping("/list-by-ids") | |
| 73 | + @Operation(summary = "获得优惠劵模版列表") | |
| 74 | + @Parameter(name = "ids", description = "优惠券模板编号列表") | |
| 75 | + public CommonResult<List<AppCouponTemplateRespVO>> getCouponTemplateList( | |
| 76 | + @RequestParam(value = "ids", required = false) Set<Long> ids) { | |
| 77 | + // 1. 查询 | |
| 78 | + List<CouponTemplateDO> list = couponTemplateService.getCouponTemplateList(ids); | |
| 79 | + | |
| 80 | + // 2.1 领取数量 | |
| 81 | + Map<Long, Boolean> canCanTakeMap = couponService.getUserCanCanTakeMap(getLoginUserId(), list); | |
| 82 | + // 2.2 拼接返回 | |
| 83 | + return success(CouponTemplateConvert.INSTANCE.convertAppList(list, canCanTakeMap)); | |
| 84 | + } | |
| 85 | + | |
| 72 | 86 | @GetMapping("/page") |
| 73 | 87 | @Operation(summary = "获得优惠劵模版分页") |
| 74 | 88 | public CommonResult<PageResult<AppCouponTemplateRespVO>> getCouponTemplatePage(AppCouponTemplatePageReqVO pageReqVO) { | ... | ... |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/coupon/CouponTemplateConvert.java