From 6798c43df6ea28179c7a1cd737730482b2452812 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 11:17:25 +0800
Subject: [PATCH] bug：惠民卡代金券支付字段返回
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
index 3581e96..ac9568d 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
@@ -16,6 +16,8 @@
import com.dsh.activity.feignclient.other.StoreClient;
import com.dsh.activity.feignclient.other.model.Store;
import com.dsh.activity.model.CouponListVo;
+import com.dsh.activity.model.CouponDeductionQuery;
+import com.dsh.activity.model.CouponDeductionVO;
import com.dsh.activity.model.GrantCoupon;
import com.dsh.activity.model.SendCouponReq;
import com.dsh.activity.service.*;
@@ -74,6 +76,18 @@
private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
+
+ /**
+ * 批量查询已核销优惠券的抵扣金额，供运营数据统计使用。
+ *
+ * @param query 用户优惠券领取记录 ID 集合
+ * @return 每条领取记录对应的抵扣金额
+ */
+ @ResponseBody
+ @PostMapping("/base/userCoupon/queryDeductionAmounts")
+ public List<CouponDeductionVO> queryDeductionAmounts(@RequestBody CouponDeductionQuery query) {
+ return userCouponService.queryDeductionAmounts(query);
+ }
@PostMapping("/base/userConpon/getStuOfConpons")
public List<CouponStuAvailableVo> queryUserWithConponList(@RequestParam("appUserId") Integer appUserId) {
@@ -187,6 +201,25 @@
}
}
+ @ResponseBody
+ @PostMapping("/api/coupon/queryStoreCouponList")
+ @ApiOperation(value = "订单支付页可用优惠券列表（购买门票、购买惠民卡）")
+ public ResultUtil<List<CouponListVo>> queryStoreCouponList(Integer storeId, Double price, String lon, String lat) {
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if (uid == null) {
+ return ResultUtil.tokenErr();
+ }
+ if (storeId == null || price == null || price < 0) {
+ return ResultUtil.error("门店和订单金额不能为空");
+ }
+ return ResultUtil.success(userCouponService.queryStoreCouponList(uid, storeId, price, lon, lat));
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
/**
* 根据id获取用户优惠券数据
--
Gitblit v1.7.1