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/CouponClient.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CouponClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CouponClient.java
index e4cca9c..fa1f21b 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CouponClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CouponClient.java
@@ -1,11 +1,16 @@
package com.dsh.course.feignClient.activity;
-import com.dsh.course.feignClient.activity.model.Coupon;
-import com.dsh.course.feignClient.activity.model.CouponExamineListSearch;
-import com.dsh.course.feignClient.activity.model.CouponListOfSearch;
+import com.dsh.course.feignClient.activity.model.*;
import com.dsh.guns.modular.system.model.CouponDataVo;
+import com.dsh.guns.modular.system.model.CouponStore;
+import com.dsh.guns.modular.system.model.dto.VipDetailDto;
+import com.dsh.guns.modular.system.model.dto.VipPaymentDto;
+import com.dsh.guns.modular.system.model.vo.VipDetailVO;
+import com.dsh.guns.modular.system.model.vo.VipPaymentListVO;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -15,9 +20,28 @@
@FeignClient(value = "mb-cloud-activity")
public interface CouponClient {
+ /**
+ * 批量查询已核销优惠券的抵扣金额。
+ *
+ * @param query 用户优惠券领取记录 ID 集合
+ * @return 每条优惠券领取记录对应的抵扣金额
+ */
+ @PostMapping("/base/userCoupon/queryDeductionAmounts")
+ List<CouponDeductionVO> queryDeductionAmounts(@RequestBody CouponDeductionQuery query);
+
+ /** 所有已支付的积分+现金优惠券购买订单（平台营收统计使用）。 */
+ @PostMapping("/base/userCouponPayment/listPaid")
+ List<UserCouponPayment> listPaidCouponPayments();
+
@PostMapping("/base/coupon/queryCouponListSearch")
List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch);
+ @PostMapping("/base/coupon/getCouponListAllOfSearch")
+ List<Map<String,Object>> getCouponListAllOfSearch(@RequestBody CouponListOfSearch ofSearch);
+
+
+ @PostMapping("/base/coupon/queryCouponListSearch1")
+ List<Map<String,Object>> getCouponListOfSearch1(@RequestBody CouponListOfSearch ofSearch);
@PostMapping("/base/coupon/couponExamineListSearch")
@@ -29,6 +53,10 @@
@PostMapping("/coupon/queryCouponById")
Coupon queryCouponById(@RequestBody Integer id);
+ @PostMapping("/coupon/queryCouponAll")
+ List<Coupon> queryCouponAll();
+ @PostMapping("/coupon/queryCouponList")
+ List<Coupon> queryCouponList();
@PostMapping("/base/coupon/updateCouponExamine")
@@ -37,4 +65,27 @@
@PostMapping("/base/coupon/insertIntoCouponData")
void insertIntoData(@RequestBody CouponDataVo dataVo);
+ @PostMapping("/base/coupon/queryCity")
+ List<CouponCity> queryCity(Integer id);
+ @PostMapping("/base/coupon/queryAllCity")
+ List<CouponCity> queryAllCity();
+ @PostMapping("/base/coupon/queryStore")
+ List<Integer> queryStore(Integer id);
+ @PostMapping("/base/coupon/queryAllStore")
+ List<CouponStore> queryAllStore();
+
+ @PostMapping("/base/coupon/listRecord")
+ List<Map<String,Object>> listRecord(CouponRecordQuery ofSearch);
+
+ @PostMapping("/base/coupon/updateType")
+ void updateType(Long id);
+ @GetMapping("/base/coupon/updateTypeOther/{id}/{operatorId}/{storeId}/{siteId}")
+ void updateTypeOther(@PathVariable("id")Long id,@PathVariable("operatorId")Integer operatorId,
+ @PathVariable("storeId")Integer storeId,@PathVariable("siteId")Integer siteId);
+ @PostMapping("/base/pointMerchars/goodsList")
+ List<PointsMerchandise> goodsList();
+ @PostMapping("/base/coupon/vipDetail")
+ List<VipDetailVO> vipDetail(@RequestBody VipDetailDto vipDetailDto);
+ @PostMapping("/base/coupon/vipPayment")
+ List<VipPaymentListVO> vipPayment(@RequestBody VipPaymentDto vipPaymentDto);
}
--
Gitblit v1.7.1