From 609d91e1e62b1e8932b34b15b09baf02e7f09a93 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 10:36:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
index 961b1c4..b1d1e35 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
@@ -5,7 +5,6 @@
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.other.api.domain.Banner;
import com.ruoyi.other.api.domain.CouponInfo;
import com.ruoyi.other.service.CouponInfoService;
import io.swagger.annotations.ApiOperation;
@@ -13,11 +12,13 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
+
import java.time.LocalDateTime;
import java.util.ArrayList;
-import java.util.List;
/**
* <p>
@@ -45,7 +46,7 @@
}
- @PostMapping("/gift/list")
+ @GetMapping("/gift/list")
@ApiOperation(value = "待领取列表", tags = {"小程序-个人中心-优惠劵"})
public R<List<CouponInfo>> giftlist(){
Long userid = tokenService.getLoginUserApplet().getUserid();
@@ -76,5 +77,19 @@
}
}
+
+
+ /**
+ * 根据id获取优惠券数据
+ * @param ids
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getCouponInfoList")
+ public R<List<CouponInfo>> getCouponInfoList(@RequestParam("ids") List<Integer> ids){
+ List<CouponInfo> couponInfos = couponInfoService.listByIds(ids);
+ return R.ok(couponInfos);
+ }
+
}
--
Gitblit v1.7.1