zoujiajian 1 год назад
Родитель
Сommit
b5858b7aca

+ 3 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/UserBenefits.java

@@ -2,6 +2,7 @@ package com.cyksj.model.entity;
 
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.ejlchina.searcher.bean.DbIgnore;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
@@ -55,6 +56,8 @@ public class UserBenefits extends BaseEntity {
 	/**
 	/**
 	 * 续费减免配置 传入参数
 	 * 续费减免配置 传入参数
 	 */
 	 */
+	@DbIgnore
+	@TableField(exist = false)
 	private List<RenewConfig> renewConfigList;
 	private List<RenewConfig> renewConfigList;
 
 
 	/**
 	/**

+ 0 - 6
netflix-dao/src/main/java/com/cyksj/model/views/UserBenefitsFrontView.java

@@ -41,12 +41,6 @@ public class UserBenefitsFrontView {
 	@DbField("g.title")
 	@DbField("g.title")
 	private String title;
 	private String title;
 
 
-	/**
-	 * 优惠券ids
-	 */
-	@DbField("ub.coupon_ids")
-	private String couponIds;
-
 	/**
 	/**
 	 * 实物套餐权益 生效套餐ids
 	 * 实物套餐权益 生效套餐ids
 	 */
 	 */

+ 11 - 1
netflix-web/src/main/java/com/cyksj/web/controller/user/UserBenefitsFrontController.java

@@ -11,11 +11,13 @@ import com.cyksj.common.util.StringUtil;
 import com.cyksj.dto.Result;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.OrderDonMapper;
 import com.cyksj.mapper.OrderDonMapper;
+import com.cyksj.mapper.UserActivityMapper;
 import com.cyksj.mapper.UserBenefitsOrderRecordMapper;
 import com.cyksj.mapper.UserBenefitsOrderRecordMapper;
 import com.cyksj.mapper.UserCertRecordMapper;
 import com.cyksj.mapper.UserCertRecordMapper;
 import com.cyksj.mapper.manage.coupon.CouponSkuMapper;
 import com.cyksj.mapper.manage.coupon.CouponSkuMapper;
 import com.cyksj.mapper.manage.coupon.CouponUserMapper;
 import com.cyksj.mapper.manage.coupon.CouponUserMapper;
 import com.cyksj.model.entity.OrderDon;
 import com.cyksj.model.entity.OrderDon;
+import com.cyksj.model.entity.UserActivity;
 import com.cyksj.model.entity.UserBenefits;
 import com.cyksj.model.entity.UserBenefits;
 import com.cyksj.model.entity.UserCertRecord;
 import com.cyksj.model.entity.UserCertRecord;
 import com.cyksj.model.views.*;
 import com.cyksj.model.views.*;
@@ -63,6 +65,8 @@ public class UserBenefitsFrontController {
 
 
 	private final RedisService redisService;
 	private final RedisService redisService;
 
 
+	private final UserActivityMapper userActivityMapper;
+
 	@GetMapping("/get")
 	@GetMapping("/get")
 	public Result<List<UserBenefitsFrontView>> getUserBenefits(UserBenefits.Type type) {
 	public Result<List<UserBenefitsFrontView>> getUserBenefits(UserBenefits.Type type) {
 		long userId = StpUserUtil.getLoginIdAsLong();
 		long userId = StpUserUtil.getLoginIdAsLong();
@@ -133,7 +137,13 @@ public class UserBenefitsFrontController {
 				fhCount = userCertRecordMapper.selectCount(Wrappers.lambdaQuery(UserCertRecord.class)
 				fhCount = userCertRecordMapper.selectCount(Wrappers.lambdaQuery(UserCertRecord.class)
 						.in(UserCertRecord::getUserId, userIdList));
 						.in(UserCertRecord::getUserId, userIdList));
 				try {
 				try {
-					List<Long> couponIds = Jsons.parseList(data.getCouponIds(), Long.class);
+					//获取大学生认证优惠券
+					UserActivity userActivity = userActivityMapper.selectOne(Wrappers.lambdaQuery(UserActivity.class)
+							.eq(UserActivity::getType, 0)
+							.eq(UserActivity::getDeleted, 1)
+							.last("limit 1"));
+					String couponIdsStr = userActivity.getCouponIds();
+					List<Long> couponIds = Jsons.parseList(couponIdsStr, Long.class);
 					//优惠券使用详情
 					//优惠券使用详情
 					if (fhCount > 0) {
 					if (fhCount > 0) {
 						List<CouponUserView> couponUserViews = couponUserMapper.couponPersonalByCouponIds(couponIds);
 						List<CouponUserView> couponUserViews = couponUserMapper.couponPersonalByCouponIds(couponIds);