From 474724c0e016be419fe84967fdcb085722e6b444 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 22 九月 2026 11:20:12 +0800
Subject: [PATCH] bug:营收统计数据修改

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 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 ddab429..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
@@ -45,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);
@@ -87,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);
 
@@ -103,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