From 8a85fc834d98b2c14c5b886a957ccf3197aad293 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期日, 20 九月 2026 17:12:28 +0800
Subject: [PATCH] feat：优惠券使用入口：购买门票、预定场地、购买惠民卡
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 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 96d1e55..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.*;
@@ -67,11 +69,25 @@
private StoreClient storeClient;
@Autowired
private SiteClient siteClient;
+ @Autowired
+ private PointsMerchandiseService pointsMerchandiseService;
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) {
@@ -185,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获取用户优惠券数据
@@ -234,12 +269,18 @@
UserPointsMerchandise userPointsMerchandise = userPointsMerchandiseService.getById(id);
System.err.println("积分商城门票数据"+ userPointsMerchandise);
if (userPointsMerchandise!=null){
- System.err.println("修改使用状态");
- userPointsMerchandise.setUserId(null);
- userPointsMerchandise.setVerificationTime(new Date());
- userPointsMerchandise.setVerifiStoreId(storeId);
- userPointsMerchandise.setStatus(2);
- userPointsMerchandiseService.updateById(userPointsMerchandise);
+ PointsMerchandise pointsMerchandise = pointsMerchandiseService.getById(userPointsMerchandise.getPointsMerchandiseId());
+ if (pointsMerchandise!=null){
+ if (pointsMerchandise.getCardType()==1){
+ System.err.println("日卡修改使用状态");
+ userPointsMerchandise.setUserId(null);
+ userPointsMerchandise.setVerificationTime(new Date());
+ userPointsMerchandise.setVerifiStoreId(storeId);
+ userPointsMerchandise.setStatus(2);
+ userPointsMerchandiseService.updateById(userPointsMerchandise);
+ }
+ }
+
}else{
System.err.println("未查询到积分商城门票数据"+ id);
}
--
Gitblit v1.7.1