From 378ee0f70e1eafdd7165aa1c6ec9f05a8071c1a8 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 26 十月 2023 11:07:15 +0800
Subject: [PATCH] 10.26.3

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 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 5e172f0..583362d 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
@@ -3,6 +3,10 @@
 
 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.guns.modular.system.model.CoachChangeStateVO;
 import com.dsh.guns.modular.system.model.PointMerchandiseIncomeVo;
 import com.dsh.guns.modular.system.model.GoodsInfoOneVo;
@@ -13,6 +17,7 @@
 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;
 
@@ -83,4 +88,15 @@
     @PostMapping("/base/pointMerchars/writeOffGoodsStatus")
     boolean writeOffGoodsStatus(@RequestBody Map<String, Object> map);
 
+    @PostMapping("/base/pointMerchars/getIntegralGoodsListOfSearchAudit")
+    List<Map<String,Object>>  getIntegralGoodsListOfSearchAudit(IntegralGoodsOfSearch ofSearch);
+
+    @PostMapping("/base/pointMerchars/updateType")
+    Object updateType(String s);
+
+
+    @PostMapping("/base/pointMerchars/queryFee")
+    HashMap<String, Object> queryFee(QueryDataFee queryDataFee);
+
+
 }

--
Gitblit v1.7.1