fix 店铺车票、订单数据拆分

netflix-dao/src/main/java/com/cyksj/model/views/UserTicketView.java

@@ -38,4 +38,7 @@ public class UserTicketView {
 	@DbField("gr.status")
 	@JsonIgnore
 	private String status;
+
+	@DbField("gr.yhs_id")
+	private Long yhsId;
 }

netflix-service/src/main/java/com/cyksj/service/relation/GroupRelationFrontService.java

@@ -15,7 +15,7 @@ import java.util.List;
  *创建时间:2022/12/29 15:42
  */
 public interface GroupRelationFrontService {
-	List<RenewalView> getMyTicket(long userId, Boolean isLoginPopularize);
+	List<RenewalView> getMyTicket(long userId, Boolean isLoginPopularize, Long yhsId);
 
 	Boolean isJoinCorpWx(Long userId, Boolean isJoin, Boolean noCoupon);
 

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -24,12 +24,14 @@ import com.cyksj.service.relation.GroupRelationFrontService;
 import com.cyksj.service.user.UserBindRelationService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.param.Operator;
+import com.ejlchina.searcher.util.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -62,15 +64,21 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 
 	private final OrderDonMapper orderDonMapper;
 
+	private final HttpServletRequest request;
+
 	@Override
-	public List<RenewalView> getMyTicket(long userId, Boolean isLoginPopularize) {
+	public List<RenewalView> getMyTicket(long userId, Boolean isLoginPopularize, Long yhsId) {
 		User u = userMapper.selectById(userId);
 		if (u == null) throw BusinessRuntimeException.getGatewayApiCode(GatewayApiCode.CMS_TOKEN_VALID);
 		if (u.getIsBlack()) {
 			return new ArrayList<>();
 		}
 		List<Long> userIds = userBindRelationService.getRelationUserIdList(userId, u);
-		List<RenewalView> list = beanSearcher.searchAll(RenewalView.class, MapUtils.builder()
+		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
+		if (yhsId == null) {
+			builder.field(RenewalView::getYhsId, 0);
+		}
+		List<RenewalView> list = beanSearcher.searchAll(RenewalView.class, builder
 				.field(RenewalView::getUserId, 0).op(Operator.GreaterThan)
 				.field(RenewalView::getUserId, userIds).op(Operator.InList)
 				.field(RenewalView::getStatus, List.of("validity", "overdue", "outside")).op(Operator.InList)

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -108,9 +108,9 @@ public class GroupRelationController {
     private final static Sequence SEQUENCE = new Sequence(0);
 
     @RequestMapping("/get/renewal")
-    public Result<List<RenewalView>> get(Boolean isLoginPopularize) {
+    public Result<List<RenewalView>> get(Boolean isLoginPopularize, Long yhsId) {
         long userId = StpUserUtil.getLoginIdAsLong();
-        List<RenewalView> list = groupRelationFrontService.getMyTicket(userId, isLoginPopularize);
+        List<RenewalView> list = groupRelationFrontService.getMyTicket(userId, isLoginPopularize, yhsId);
         return GatewayResponse.SUCCESS.newBuilder().toResult(list);
     }
 

netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderController.java

@@ -40,6 +40,7 @@ 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.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import com.google.gson.JsonSyntaxException;
 import com.paypal.api.payments.Links;
@@ -342,10 +343,14 @@ public class OrderController {
      * 获取订单列表
      */
     @GetMapping("/get")
-    public Result<SearchResult<OrderDonView>> list(){
+    public Result<SearchResult<OrderDonView>> list(Long yhsId){
         long userId = StpUserUtil.getLoginIdAsLong();
+        MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
+        if (yhsId == null) {
+            builder.field(OrderDonView::getYhsId, 0);
+        }
         List<Long> userIds = UserBindRelationService.getRelationUserIdList(userId, null);
-        SearchResult<OrderDonView> search = beanSearcher.search(OrderDonView.class, MapUtils.flatBuilder(request.getParameterMap())
+        SearchResult<OrderDonView> search = beanSearcher.search(OrderDonView.class, builder
                 .field(OrderDonView::getUserId, userIds).op(Operator.InList)
                 .orderBy(OrderDonView::getId).desc()
                 .build());

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

@@ -29,6 +29,7 @@ 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.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.util.Assert;
@@ -90,10 +91,14 @@ public class UserController {
      * 个人中心详情
      */
     @GetMapping("/personal")
-    public Result<UserPersonalView> getPersonalView() {
+    public Result<UserPersonalView> getPersonalView(Long yhsId) {
         long userId = StpUserUtil.getLoginIdAsLong();
         List<Long> userIds = userBindRelationService.getRelationUserIdList(userId, null);
-        Number ticketNum = beanSearcher.searchCount(UserTicketView.class, MapUtils.builder()
+        MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
+        if (yhsId == null) {
+            builder.field(UserTicketView::getYhsId, 0);
+        }
+        Number ticketNum = beanSearcher.searchCount(UserTicketView.class, builder
                 .field(UserTicketView::getUserId, userIds).op(Operator.InList)
                 .field(RenewalView::getStatus, List.of("validity", "overdue", "outside")).op(Operator.InList)
                 .build());