From 572df690f72ed4a077d934823f261dec39b3cc7d Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 08 九月 2026 17:11:34 +0800
Subject: [PATCH] feat&bug：文档内容修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 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 d475fb7..c5bdf33 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) {
@@ -211,8 +227,8 @@
* @param id
* @return
*/
- @GetMapping("/userCoupon/changeTicketStatus/{id}")
- public void changeTicketStatus(@PathVariable("id") String id){
+ @GetMapping("/userCoupon/changeTicketStatus/{id}/{storeId}/{siteId}")
+ public void changeTicketStatus(@PathVariable("id") String id,@PathVariable("storeId") Integer storeId,@PathVariable("siteId") Integer siteId){
System.err.println("数据id"+id);
if (id.length()<=11){
// 购买会员赠送的门票
@@ -222,6 +238,8 @@
if (vipDetail!=null){
System.err.println("修改使用状态");
vipDetail.setStatus(2);
+ vipDetail.setUseStoreId(storeId);
+ vipDetail.setUseSiteId(siteId);
vipDetailService.updateById(vipDetail);
}else{
System.err.println("未查询到会员权益门票数据"+ id);
@@ -232,11 +250,18 @@
UserPointsMerchandise userPointsMerchandise = userPointsMerchandiseService.getById(id);
System.err.println("积分商城门票数据"+ userPointsMerchandise);
if (userPointsMerchandise!=null){
- System.err.println("修改使用状态");
- userPointsMerchandise.setUserId(null);
- userPointsMerchandise.setVerificationTime(new Date());
- 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