From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java |   11 ++++++++++-
 1 files changed, 10 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 583362d..050a5a3 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
@@ -7,6 +7,7 @@
 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.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;
@@ -23,6 +24,10 @@
 
 @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);
     /**
@@ -98,5 +103,9 @@
     @PostMapping("/base/pointMerchars/queryFee")
     HashMap<String, Object> queryFee(QueryDataFee queryDataFee);
 
-
+    /**
+     * 根据id查询
+     */
+    @RequestMapping("/base/pointMerchars/getById")
+    PointsMerchandise getById(@RequestBody Integer id);
 }

--
Gitblit v1.7.1