From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
index 12804de..83a7f6f 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
@@ -4,10 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.activity.entity.Coupon;
-import com.dsh.activity.entity.CouponCity;
-import com.dsh.activity.entity.CouponStore;
-import com.dsh.activity.entity.UserCoupon;
+import com.dsh.activity.entity.*;
import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.account.StudentClient;
import com.dsh.activity.feignclient.account.model.AppUser;
@@ -17,10 +14,7 @@
import com.dsh.activity.feignclient.other.StoreClient;
import com.dsh.activity.feignclient.other.model.Site;
import com.dsh.activity.feignclient.other.model.StoreDetailOfCourse;
-import com.dsh.activity.mapper.CouponCityMapper;
-import com.dsh.activity.mapper.CouponMapper;
-import com.dsh.activity.mapper.CouponStoreMapper;
-import com.dsh.activity.mapper.UserCouponMapper;
+import com.dsh.activity.mapper.*;
import com.dsh.activity.model.ConponJsonRuleModel;
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.model.request.CouponPackageReq;
@@ -54,6 +48,8 @@
@Autowired
private GDMapGeocodingUtil gdMapGeocodingUtil;
+ @Autowired
+ private PointsMerchandiseMapper pointsMerchandiseMapper;
@Resource
private AppUserClient appClient;
@@ -255,6 +251,14 @@
ruleModel.setDeductionAmount("");
ruleModel.setExperienceName(jsonObject.getString("experienceName"));
break;
+ case 4:
+// 抵扣券
+ Integer goodsId = coupon.getGoodsId();
+ PointsMerchandise pointsMerchandise = pointsMerchandiseMapper.selectById(goodsId);
+ ruleModel.setConditionalAmount("");
+ ruleModel.setDeductionAmount("");
+ ruleModel.setExperienceName(pointsMerchandise.getName());
+ break;
default:
break;
}
@@ -273,6 +277,9 @@
if (userCoupon.getStatus() == 2) {
packageResp.setUseStatus(2);
}
+ if (userCoupon.getStatus() == 3) {
+ packageResp.setUseStatus(3);
+ }
respList.add(packageResp);
}
if (null != req.getCouponType()) {
--
Gitblit v1.7.1