From 0c0ca0349e7392cd08d8bb1417f51c320e77088d Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期六, 17 八月 2024 15:58:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java index a94298d..3e4f054 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java @@ -87,6 +87,8 @@ }else{ record.setMeetTheConditions("满"+byId.getMeetTheConditions()+"元可用"); } + record.setCoverPicture(byId.getCoverPicture()); + record.setDetailsPicture(byId.getDetailsPicture()); } } return AjaxResult.ok(data); @@ -132,5 +134,17 @@ } return R.ok(list); } + + + /** + * 根据id获取优惠券信息 + * @param id + * @return + */ + @PostMapping(value = "/getCouponById/{id}") + public R<TCoupon> getCouponById(@PathVariable Integer id){ + TCoupon coupon = tCouponService.getById(id); + return R.ok(coupon); + } } -- Gitblit v1.7.1