fix

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

@@ -74,7 +74,7 @@ public class UserBenefitsFrontController {
 	 * 权益分类
 	 */
 	@GetMapping("/get/classification")
-	public Result<Map<UserBenefits.Type, List<UserBenefitsFrontView>>> getUserBenefitsClassification(Long relationId) {
+	public Result<Map<UserBenefits.Type, List<UserBenefitsFrontView>>> getUserBenefitsClassification() {
 		String key = RedisService.key.USER_BENEFITS_KEY.getName() + ":cfc";
 		long userId = StpUserUtil.getLoginIdAsLong();
 		Object o = redisService.get(key);
@@ -88,7 +88,7 @@ public class UserBenefitsFrontController {
 			classifications = (Map<UserBenefits.Type, List<UserBenefitsFrontView>>) o;
 		}
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-		classifications.values().forEach(list -> setDataInfo(list, null, userIdList, true, relationId));
+		classifications.values().forEach(list -> setDataInfo(list, null, userIdList, true, userId));
 		return GatewayResponse.SUCCESS.newBuilder().toResult(classifications);
 	}
 
@@ -96,7 +96,7 @@ public class UserBenefitsFrontController {
 	 * 用户权益
 	 */
 	@GetMapping("/get")
-	public Result<List<UserBenefitsFrontView>> getUserBenefits(UserBenefits.Type type, Long relationId) {
+	public Result<List<UserBenefitsFrontView>> getUserBenefits(UserBenefits.Type type) {
 		long userId = StpUserUtil.getLoginIdAsLong();
 		String key = RedisService.key.USER_BENEFITS_KEY.getName();
 		if (type != null) {
@@ -118,12 +118,12 @@ public class UserBenefitsFrontController {
 			userBenefitsFrontViews = (List<UserBenefitsFrontView>) o;
 		}
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-		setDataInfo(userBenefitsFrontViews, type, userIdList, false, relationId);
+		setDataInfo(userBenefitsFrontViews, type, userIdList, false, userId);
 		return GatewayResponse.SUCCESS.newBuilder().toResult(userBenefitsFrontViews);
 	}
 
 
-	public void setDataInfo(List<UserBenefitsFrontView> userBenefitsFrontViews, UserBenefits.Type type, List<Long> userIdList, Boolean isAll, Long relationId) {
+	public void setDataInfo(List<UserBenefitsFrontView> userBenefitsFrontViews, UserBenefits.Type type, List<Long> userIdList, Boolean isAll, Long userId) {
 		for (UserBenefitsFrontView data : userBenefitsFrontViews) {
 			if (isAll || type == null) {
 				type = data.getType();
@@ -179,7 +179,7 @@ public class UserBenefitsFrontController {
 					List<Long> couponIds = Jsons.parseList(couponIdsStr, Long.class);
 					//优惠券使用详情
 					if (fhCount > 0) {
-						List<CouponUserView> couponUserViews = couponUserMapper.couponPersonalByCouponIds(userIdList, couponIds);
+						List<CouponUserView> couponUserViews = couponUserMapper.couponPersonalByCouponIds(List.of(userId), couponIds);
 						couponUserViews.forEach(couponUserView -> {
 							String str = couponSkuMapper.selectGoodsSkuStr(couponUserView.getCouponId());
 							couponUserView.setGoodsSkuStr(str.replaceAll(",", "/").replaceAll(";", ""));