From dcb96821f905f3fd93c059d8703517bdcac4d336 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 29 九月 2026 20:02:02 +0800
Subject: [PATCH] 排序问题及门店手机号展示问题
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java | 93 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 89 insertions(+), 4 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 b1f1fcb..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
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.dsh.activity.entity.*;
import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.account.StudentClient;
@@ -15,12 +16,11 @@
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.CouponStoreService;
-import com.dsh.activity.service.ICouponService;
-import com.dsh.activity.service.UserCouponService;
-import com.dsh.activity.service.VipDetailService;
+import com.dsh.activity.service.*;
import com.dsh.activity.util.DateUtil;
import com.dsh.activity.util.ResultUtil;
import com.dsh.activity.util.TokenUtil;
@@ -51,6 +51,9 @@
@Autowired
private UserCouponService userCouponService;
+ @Autowired
+ private UserPointsMerchandiseService userPointsMerchandiseService;
+
@Autowired
private CouponStoreService csServie;
@@ -66,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) {
@@ -184,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获取用户优惠券数据
@@ -203,6 +239,55 @@
}
}
+
+ /**
+ * 根据id修改门票使用状态
+ *
+ * @param id
+ * @return
+ */
+ @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){
+ // 购买会员赠送的门票
+ System.err.println("会员赠送门票");
+ VipDetail vipDetail = vipDetailService.getById(Integer.valueOf(id));
+ System.err.println("会员权益门票数据"+ vipDetail);
+ if (vipDetail!=null){
+ System.err.println("修改使用状态");
+ vipDetail.setStatus(2);
+ vipDetail.setUseStoreId(storeId);
+ vipDetail.setUseSiteId(siteId);
+ vipDetailService.updateById(vipDetail);
+ }else{
+ System.err.println("未查询到会员权益门票数据"+ id);
+ }
+ }else{
+ // 积分商城门票
+ System.err.println("积分商城门票id");
+ UserPointsMerchandise userPointsMerchandise = userPointsMerchandiseService.getById(id);
+ System.err.println("积分商城门票数据"+ userPointsMerchandise);
+ if (userPointsMerchandise!=null){
+ 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);
+ }
+ }
+
+ }
+
@ResponseBody
@PostMapping("/userCoupon/queryUserCouponById1")
public UserCoupon queryUserCouponById1(@RequestBody Long id) {
--
Gitblit v1.7.1