From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java
index 6589158..b29a0a4 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java
@@ -2,21 +2,51 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.course.feignClient.activity.model.*;
+import com.dsh.course.feignClient.account.model.QueryDataFee;
import com.dsh.course.feignClient.activity.model.IntegralGoodsOfSearch;
import com.dsh.course.feignClient.activity.model.PointMercharsPayedVo;
import com.dsh.course.feignClient.activity.model.PointMercharsVo;
-import com.dsh.course.feignClient.activity.model.PointsMerchandise;
+import com.dsh.course.feignClient.course.model.CourseChangeStateDTO;
+import com.dsh.guns.modular.system.model.CoachChangeStateVO;
+import com.dsh.guns.modular.system.model.PointMerchandiseIncomeVo;
import com.dsh.guns.modular.system.model.GoodsInfoOneVo;
import com.dsh.guns.modular.system.model.StoreVos;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@FeignClient(value = "mb-cloud-activity")
public interface PointMercharsClient {
+
+ @RequestMapping("/base/pointMerchars/changeState")
+ Object changeState(@RequestBody CourseChangeStateDTO dto);
+
+ @RequestMapping("/base/pointMerchars/writeOff")
+ Object writeOff(@RequestBody WriteOffDTO dto);
+ /**
+ * 门票上下架 state=1 上架 state=2 下架
+ */
+ @RequestMapping("/base/pointMerchars/changeState")
+ Object changeState(@RequestBody CoachChangeStateVO dto);
+ /**
+ * 门票管理查询
+ * @param ofSearch
+ * @return
+ */
+ @PostMapping("/base/pointMerchars/ticketList")
+ List<Map<String,Object>> ticketList(@RequestBody IntegralGoodsOfSearch ofSearch);
+ /**
+ * 获取积分商票消费金额
+ */
+ @RequestMapping("/base/pointMerchars/getAmount")
+ List<PointMerchandiseIncomeVo> getAmount();
@PostMapping("/base/pointMerchars/queryGoodsListSearch")
List<Map<String,Object>> getIntegralGoodsListOfSearch(@RequestBody IntegralGoodsOfSearch ofSearch);
@@ -57,6 +87,9 @@
@PostMapping("/base/pointMerchars/addOther")
Boolean addOther(@RequestBody String pam);
+ @PostMapping("/base/pointMerchars/addOther1")
+ Boolean addOther1(@RequestBody String pam1);
+
@PostMapping("/base/pointMerchars/addCitys")
Boolean addCitys(@RequestBody List<Map<String, String>> objects);
@@ -70,4 +103,12 @@
Object updateType(String s);
+ @PostMapping("/base/pointMerchars/queryFee")
+ HashMap<String, Object> queryFee(QueryDataFee queryDataFee);
+
+ /**
+ * 根据id查询
+ */
+ @RequestMapping("/base/pointMerchars/getById")
+ PointsMerchandise getById(@RequestBody Integer id);
}
--
Gitblit v1.7.1