From cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 28 八月 2025 20:14:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/CouponClient.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/CouponClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/CouponClient.java
index 2e253eb..64b9c5d 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/CouponClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/CouponClient.java
@@ -1,8 +1,13 @@
 package com.dsh.other.feignclient.activity;
 
 import com.dsh.other.feignclient.activity.model.Coupon;
+import com.dsh.other.feignclient.activity.model.PointsMerchandise;
+import com.dsh.other.model.CouponCity;
+import com.dsh.other.model.CouponStore;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
 
 /**
  * @author zhibing.pu
@@ -14,9 +19,18 @@
 
     /**
      * 根据id获取优惠券
+     *
      * @param id
      * @return
      */
     @PostMapping("/coupon/queryCouponById")
     Coupon queryCouponById(Integer id);
+    @PostMapping("/coupon/queryCouponAll")
+    List<Coupon> queryCouponAll();
+    @PostMapping("/base/coupon/queryAllStore")
+    List<CouponStore> queryAllStore();
+    @PostMapping("/base/coupon/queryAllCity")
+    List<CouponCity> queryAllCity();
+    @PostMapping("/base/coupon/queryAllPointGoods")
+    List<PointsMerchandise> queryAllPointGoods();
 }

--
Gitblit v1.7.1