|
|
@@ -11,9 +11,11 @@ import com.cyksj.model.entity.UserFeedbackRecord;
|
|
|
import com.cyksj.model.entity.UserRecommendGoodsRecord;
|
|
|
import com.cyksj.model.views.UserFeedbackProgressRecordFrontView;
|
|
|
import com.cyksj.service.suggest.UserSuggestService;
|
|
|
+import com.cyksj.service.user.UserBindRelationService;
|
|
|
import com.cyksj.web.util.StpUserUtil;
|
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
|
import com.ejlchina.searcher.SearchResult;
|
|
|
+import com.ejlchina.searcher.param.Operator;
|
|
|
import com.ejlchina.searcher.util.MapUtils;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
@@ -44,6 +46,8 @@ public class UserSuggestController {
|
|
|
|
|
|
private final UserSuggestService userSuggestService;
|
|
|
|
|
|
+ private final UserBindRelationService userBindRelationService;
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 平台使用建议
|
|
|
@@ -74,8 +78,9 @@ public class UserSuggestController {
|
|
|
@GetMapping("/goods/usage/feedback/list")
|
|
|
public Result<SearchResult<UserFeedbackRecord>> getFeedbackList() {
|
|
|
long userId = StpUserUtil.getLoginIdAsLong();
|
|
|
+ List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
|
|
|
SearchResult<UserFeedbackRecord> search = beanSearcher.search(UserFeedbackRecord.class, MapUtils.flatBuilder(request.getParameterMap())
|
|
|
- .field(UserFeedbackRecord::getUserId, userId)
|
|
|
+ .field(UserFeedbackRecord::getUserId, userIdList).op(Operator.InList)
|
|
|
.orderBy(UserFeedbackRecord::getUpdateTime).desc()
|
|
|
.onlySelect(UserFeedbackRecord::getId, UserFeedbackRecord::getGoodsId, UserFeedbackRecord::getIsNewReply, UserFeedbackRecord::getDescription, UserFeedbackRecord::getGoodsTitle, UserFeedbackRecord::getCreatedTime, UserFeedbackRecord::getUpdateTime)
|
|
|
.build());
|
|
|
@@ -101,9 +106,11 @@ public class UserSuggestController {
|
|
|
public Result<List<UserFeedbackProgressRecordFrontView>> getFeedbackContentList(Long feedbackId) {
|
|
|
long userId = StpUserUtil.getLoginIdAsLong();
|
|
|
Assert.notNull(feedbackId, "查看错误");
|
|
|
+ List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
|
|
|
+ userIdList.add(0l);
|
|
|
List<UserFeedbackProgressRecordFrontView> search = beanSearcher.searchAll(UserFeedbackProgressRecordFrontView.class, MapUtils.flatBuilder(request.getParameterMap())
|
|
|
.field(UserFeedbackProgressRecordFrontView::getFeedbackId, feedbackId)
|
|
|
- .field(UserFeedbackProgressRecordFrontView::getUserId, userId)
|
|
|
+ .field(UserFeedbackProgressRecordFrontView::getUserId, userIdList).op(Operator.InList)
|
|
|
.build());
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(search);
|
|
|
}
|
zoujiajian