From dec64d47a9a3a3cc133afdf5141744d90fcb49b4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 01 九月 2025 15:46:42 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

---
 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java
index d757b42..311115d 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java
@@ -1,6 +1,7 @@
 package com.dsh.account.feignclient.activity;
 
 import com.dsh.account.feignclient.activity.model.CommodityRequest;
+import com.dsh.account.feignclient.activity.model.GrantCoupon;
 import com.dsh.account.feignclient.activity.model.UserCoupon;
 import com.dsh.account.model.dto.Coupon;
 import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo;
@@ -15,11 +16,13 @@
      * 查询注册赠送优惠券 判断当前优惠券限领数量
      */
     @PostMapping("/coupon/queryCouponByUser/{userId}")
-    public List<Integer> queryCouponByUser(@PathVariable("userId") Integer userId);
+    public List<Long> queryCouponByUser(@PathVariable("userId") Integer userId);
 
     @PostMapping("/base/userConpon/getStuOfConpons")
     public List<CouponStuAvailableVo> queryUserWithConponList(@RequestParam("appUserId") Integer appUserId);
 
+    @PostMapping("/coupon/queryCouponById")
+    Coupon queryCouponById(Integer id);
 
     @PostMapping("/base/coupon/getAllCoupons")
     public List<Coupon> getAllCoupons(@RequestBody CommodityRequest request);
@@ -33,4 +36,17 @@
 
     @PostMapping("/userCoupon/queryCouponOfStore")
     List<Integer> getCouponStoreIds(@RequestBody Integer couponId);
+
+
+    @PostMapping("/userCoupon/queryCounts")
+    Integer queryCounts(@RequestBody List<Integer> queryIds);
+
+
+    @PostMapping("/userCoupon/queryCounts1")
+    Integer queryCounts1(@RequestBody List<Integer> queryIds);
+
+    @PostMapping("/userCoupon/grantCoupon")
+    void grantCoupon(@RequestBody GrantCoupon grantCoupon);
+    @GetMapping("/userCoupon/setStatusVipDetail/{id}")
+    void setStatusVipDetail(@PathVariable("id") Integer id);
 }

--
Gitblit v1.7.1