From 41c07e4558ed3a1cbdda0711f78cd3a812c06829 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 28 九月 2023 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 55 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 57a674d..6589158 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
@@ -1,7 +1,13 @@
 package com.dsh.course.feignClient.activity;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.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;
@@ -15,4 +21,53 @@
     @PostMapping("/base/pointMerchars/queryGoodsListSearch")
     List<Map<String,Object>> getIntegralGoodsListOfSearch(@RequestBody IntegralGoodsOfSearch ofSearch);
 
+    @PostMapping("/base/pointMerchars/queryPointMerchaseDetailOfId")
+    PointMercharsVo queryPointMerchaseDetailOfId(@RequestBody Integer pointMercharsId);
+
+    @PostMapping("/base/pointMerchars/updateGoodsGroudingStatus")
+    boolean updateGoodsGroudingStatus(@RequestBody Map<String,Integer> map);
+
+    @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