|
@@ -9,11 +9,13 @@ import com.cyksj.model.entity.GroupsRelation;
|
|
|
import com.cyksj.model.entity.OrderDon;
|
|
import com.cyksj.model.entity.OrderDon;
|
|
|
import com.cyksj.model.request.OrderPayRequest;
|
|
import com.cyksj.model.request.OrderPayRequest;
|
|
|
import com.cyksj.model.views.RenewalView;
|
|
import com.cyksj.model.views.RenewalView;
|
|
|
-import com.cyksj.service.corp.CorpService;
|
|
|
|
|
|
|
+import com.cyksj.model.views.UserTicketView;
|
|
|
import com.cyksj.service.order.OrderDonService;
|
|
import com.cyksj.service.order.OrderDonService;
|
|
|
import com.cyksj.service.relation.GroupRelationFrontService;
|
|
import com.cyksj.service.relation.GroupRelationFrontService;
|
|
|
|
|
+import com.cyksj.service.user.UserService;
|
|
|
import com.cyksj.web.util.StpUserUtil;
|
|
import com.cyksj.web.util.StpUserUtil;
|
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
|
|
|
+import com.ejlchina.searcher.util.MapUtils;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -38,7 +40,7 @@ public class GroupRelationController {
|
|
|
|
|
|
|
|
private final GroupRelationFrontService groupRelationFrontService;
|
|
private final GroupRelationFrontService groupRelationFrontService;
|
|
|
|
|
|
|
|
- private final CorpService corpService;
|
|
|
|
|
|
|
+ private final UserService userService;
|
|
|
|
|
|
|
|
@RequestMapping("/get/renewal")
|
|
@RequestMapping("/get/renewal")
|
|
|
public Result<List<RenewalView>> get(Boolean isLoginPopularize) {
|
|
public Result<List<RenewalView>> get(Boolean isLoginPopularize) {
|
|
@@ -76,4 +78,18 @@ public class GroupRelationController {
|
|
|
Boolean flag = groupRelationFrontService.isJoinCorpWx(userId, false, false);
|
|
Boolean flag = groupRelationFrontService.isJoinCorpWx(userId, false, false);
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(flag);
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(flag);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 获取全部车票
|
|
|
|
|
+ */
|
|
|
|
|
+ @GetMapping("/get")
|
|
|
|
|
+ public Result<List<UserTicketView>> getUserTicketView() {
|
|
|
|
|
+ long userId = StpUserUtil.getLoginIdAsLong();
|
|
|
|
|
+ List<Long> userIds = userService.getRelationUserIdList(userId, null);
|
|
|
|
|
+ List<UserTicketView> ticketViews = beanSearcher.searchAll(UserTicketView.class, MapUtils.builder()
|
|
|
|
|
+ .field(UserTicketView::getUserId, userIds)
|
|
|
|
|
+ .orderBy(UserTicketView::getRelationId).asc()
|
|
|
|
|
+ .build());
|
|
|
|
|
+ return GatewayResponse.SUCCESS.newBuilder().toResult(ticketViews);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|