From 30774a92c4c492eb9629752faca04a00cd946304 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期三, 23 九月 2026 11:39:22 +0800
Subject: [PATCH] bug：员工角色问题
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 7a57e67..61e14f0 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,13 +2,14 @@
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.course.model.CourseChangeStateDTO;
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;
@@ -23,6 +24,12 @@
@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 下架
*/
@@ -38,8 +45,8 @@
/**
* 获取积分商票消费金额
*/
- @RequestMapping("/base/pointMerchars/getAmount")
- List<PointMerchandiseIncomeVo> getAmount();
+ @PostMapping("/base/pointMerchars/getAmount")
+ List<PointMerchandiseIncomeVo> getAmount(@RequestBody List<Integer> storeIds);
@PostMapping("/base/pointMerchars/queryGoodsListSearch")
List<Map<String,Object>> getIntegralGoodsListOfSearch(@RequestBody IntegralGoodsOfSearch ofSearch);
@@ -80,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);
@@ -96,5 +106,13 @@
@PostMapping("/base/pointMerchars/queryFee")
HashMap<String, Object> queryFee(QueryDataFee queryDataFee);
+ /** 门票收入按购买记录所属门店统计，供平台、运营商和门店营收饼图使用。 */
+ @PostMapping("/base/pointMerchars/queryTicketFee")
+ HashMap<String, Object> queryTicketFee(QueryDataFee queryDataFee);
+ /**
+ * 根据id查询
+ */
+ @RequestMapping("/base/pointMerchars/getById")
+ PointsMerchandise getById(@RequestBody Integer id);
}
--
Gitblit v1.7.1