Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_admin

ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberCouponController.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -47,6 +48,19 @@ public class MemberCouponController extends BaseController {
         return success(list);
     }
 
+    /**
+     * 查询当前登录用户通告券
+     * @author PQZ
+     * @date 18:37 2025/4/24
+     * @return com.ruoyi.common.core.domain.AjaxResult
+    **/
+    @GetMapping("/getMemberCoupon")
+    public AjaxResult getMemberCoupon() {
+        //获取当前登录用户id
+        Long userId = SecurityUtils.getUserId();
+        return success(memberCouponService.getCoupon(userId));
+    }
+
     /**
      * 导出用户通告券变动记录列表
      */

ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCouponService.java

@@ -41,4 +41,5 @@ public interface IMemberCouponService extends IService<MemberCoupon> {
      **/
     Integer getCoupon(Long userId);
 
+
 }