From 44311853fa68f04db11d341bd374a4ac9b5ea567 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期六, 07 十月 2023 17:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 43 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 8834020..16d1ccf 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,9 @@
 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.course.feignClient.activity.model.PointsMerchandise;
+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;
@@ -48,4 +51,44 @@
     @PostMapping("/base/pointMerchars/queryUserPayedGoodsList")
     List<Map<String, Object>> queryUserPayedGoodsList(@RequestBody PointMercharsPayedVo pointMercharsPayedVo);
 
+    @PostMapping("/base/pointMerchars/queryPointMerchaseById")
+    PointsMerchandise queryPointMerchaseById(Integer id);
+
+
+    @PostMapping("/base/pointMerchars/getshopName")
+    Integer getshopName(Integer id);
+
+
+    @PostMapping("/base/pointMerchars/queryDetailsOfGoods")
+    GoodsInfoOneVo queryDetailsOfGoods(@RequestBody Integer id);
+
+    @PostMapping("/base/pointMerchars/getProvinces")
+    List<StoreVos> getProvinces(@RequestBody Integer id);
+
+    @PostMapping("/base/pointMerchars/getStoreList")
+    List<StoreVos> getStoreList(@RequestBody Integer id);
+
+    @PostMapping("/base/pointMerchars/updateGoodsDetail")
+    boolean updateGoodsDetail(@RequestBody Map<String, Object> stringObjectHashMap);
+
+    @PostMapping("/base/pointMerchars/add")
+    Integer add(PointsMerchandise pointsMerchandise);
+
+
+    @PostMapping("/base/pointMerchars/addOther")
+    Boolean addOther(@RequestBody String pam);
+
+    @PostMapping("/base/pointMerchars/addCitys")
+    Boolean addCitys(@RequestBody List<Map<String, String>> objects);
+
+    @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);
+
+
 }

--
Gitblit v1.7.1