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 | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 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 5e172f0..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
@@ -3,6 +3,11 @@
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.guns.modular.system.model.GoodsInfoOneVo;
@@ -13,11 +18,16 @@
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;
@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);
/**
@@ -35,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);
@@ -77,10 +87,32 @@
@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);
@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);
+
+ /** 门票收入按购买记录所属门店统计，供平台、运营商和门店营收饼图使用。 */
+ @PostMapping("/base/pointMerchars/queryTicketFee")
+ HashMap<String, Object> queryTicketFee(QueryDataFee queryDataFee);
+
+ /**
+ * 根据id查询
+ */
+ @RequestMapping("/base/pointMerchars/getById")
+ PointsMerchandise getById(@RequestBody Integer id);
}
--
Gitblit v1.7.1