From 8b1376a256d8750f718276cbe475cb6f1f7ebddc Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 13 八月 2024 11:14:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
index b7e95ae..bf67953 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -2,15 +2,20 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.account.api.dto.CouponListDto;
import com.ruoyi.account.api.dto.GrantCouponDto;
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery;
+import com.ruoyi.account.api.vo.CouponListVOVO;
import com.ruoyi.account.api.vo.ExchangeRecordVO;
import com.ruoyi.account.service.TAppCouponService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TCoupon;
+import com.ruoyi.other.api.feignClient.OtherClient;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -35,6 +40,24 @@
public class TAppCouponController {
@Autowired
private TAppCouponService tAppCouponService;
+ @Autowired
+ private OtherClient otherClient;
+
+ /**
+ * 查询用户可用优惠券数量
+ * @param dto
+ * @return
+ */
+
+ @ApiOperation(value = "选择优惠券分页查询", tags = {"小程序-扫一扫"})
+ @PostMapping(value = "/scan/couponList")
+ public AjaxResult<PageInfo<CouponListVOVO>> couponList(@RequestBody CouponListDto dto) {
+ // todo token获取用户id
+ Long userId = 11L;
+ dto.setUserId(userId);
+ PageInfo<CouponListVOVO> res = tAppCouponService.couponList(dto);
+ return AjaxResult.ok(res);
+ }
/**
* 管理后台远程调用 根据优惠券ids 查询对应的发放数量
@@ -46,11 +69,11 @@
List<Integer> res = new ArrayList<>();
String[] split = couponIds.split(",");
// 查询每个优惠券的发放数量
- List<TAppCoupon> couponId = tAppCouponService.list(new QueryWrapper<TAppCoupon>()
- .in("coupon_id", Arrays.asList(split)));
for (String s : split) {
res.add(tAppCouponService.list(new QueryWrapper<TAppCoupon>()
- .eq("coupon_id", s)).size());
+ .eq("coupon_id", s)
+ .eq("del_flag",0)
+ ).size());
}
return R.ok(res);
}
@@ -80,7 +103,7 @@
* 后台远程调用 给用户发放优惠券
*/
@PostMapping("/grantCoupon")
- public R getExchangeRecordByCouponId(@RequestBody GrantCouponDto dto){
+ public R grantCoupon(@RequestBody GrantCouponDto dto){
List<TAppCoupon> res = new ArrayList<>();
for (String s : dto.getUserIds().split(",")) {
TAppCoupon tAppCoupon = new TAppCoupon();
--
Gitblit v1.7.1