|
|
@@ -11,11 +11,13 @@ import com.cyksj.common.util.StringUtil;
|
|
|
import com.cyksj.dto.Result;
|
|
|
import com.cyksj.enums.GatewayResponse;
|
|
|
import com.cyksj.mapper.OrderDonMapper;
|
|
|
+import com.cyksj.mapper.UserActivityMapper;
|
|
|
import com.cyksj.mapper.UserBenefitsOrderRecordMapper;
|
|
|
import com.cyksj.mapper.UserCertRecordMapper;
|
|
|
import com.cyksj.mapper.manage.coupon.CouponSkuMapper;
|
|
|
import com.cyksj.mapper.manage.coupon.CouponUserMapper;
|
|
|
import com.cyksj.model.entity.OrderDon;
|
|
|
+import com.cyksj.model.entity.UserActivity;
|
|
|
import com.cyksj.model.entity.UserBenefits;
|
|
|
import com.cyksj.model.entity.UserCertRecord;
|
|
|
import com.cyksj.model.views.*;
|
|
|
@@ -63,6 +65,8 @@ public class UserBenefitsFrontController {
|
|
|
|
|
|
private final RedisService redisService;
|
|
|
|
|
|
+ private final UserActivityMapper userActivityMapper;
|
|
|
+
|
|
|
@GetMapping("/get")
|
|
|
public Result<List<UserBenefitsFrontView>> getUserBenefits(UserBenefits.Type type) {
|
|
|
long userId = StpUserUtil.getLoginIdAsLong();
|
|
|
@@ -133,7 +137,13 @@ public class UserBenefitsFrontController {
|
|
|
fhCount = userCertRecordMapper.selectCount(Wrappers.lambdaQuery(UserCertRecord.class)
|
|
|
.in(UserCertRecord::getUserId, userIdList));
|
|
|
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) {
|
|
|
List<CouponUserView> couponUserViews = couponUserMapper.couponPersonalByCouponIds(couponIds);
|