独立规格续费列表前端自排序

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

@@ -1,7 +1,6 @@
 package com.cyksj.model.views;
 
 import com.ejlchina.searcher.bean.DbField;
-import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
@@ -21,7 +20,9 @@ import java.util.Date;
 		" left join groups_relation_independent_renew gnr on gnr.order_id = o.id" +
 		" inner join user u on u.id = gr.user_id" +
 		" left join goods_don_sku sku on sku.id = o.sku_id" +
-		" left join goods_don g on g.id = o.goods_id",
+		" left join goods_don g on g.id = o.goods_id" +
+		" left join groups_trips gt on gt.id = gr.groups_id" +
+		" left join account a on a.id = gt.account_id",
 		where = ":condition:")
 public class GroupsRelationIndependentView {
 	@DbField("gr.id")
@@ -33,10 +34,10 @@ public class GroupsRelationIndependentView {
 	@DbField("o.id")
 	private Long orderId;
 
-	@DbIgnore
+	@DbField("a.account")
 	private String account;
 
-	@DbIgnore
+	@DbField("a.password")
 	private String password;
 
 	@DbField("gr.user_id")
@@ -51,7 +52,7 @@ public class GroupsRelationIndependentView {
 	@DbField("gr.expiry_time")
 	private Date expiryTime;
 
-	@DbIgnore
+	@DbField("a.expiry_time")
 	private Date accountExpiryTime;
 
 	@DbField("ifnull(gnr.is_renew,false)")

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

@@ -172,7 +172,7 @@ public class CmsGroupRelationController {
      */
     @GetMapping("/get/chatGPT/independent/renew")
     public Result<SearchResult<GroupsRelationIndependentView>> getIndependentRenew(String account) {
-        String condition = " sku_id in (select id from goods_don_sku sku where sku.goods_id in (18,26) and sku.num = 1)" +
+        String condition = " o.sku_id in (select id from goods_don_sku sku where sku.goods_id in (18,26) and sku.num = 1)" +
                 " and o.status not in ('close','noPayment','refund') and o.order_type = 2";
         if (StrUtil.isNotEmpty(account)) {
             List<AccountView> dbAccounts = beanSearcher.searchAll(AccountView.class, MapUtils.builder().field(AccountView::getAccount, account).op(Operator.Contain).build());
@@ -183,17 +183,7 @@ public class CmsGroupRelationController {
         }
         SearchResult<GroupsRelationIndependentView> search = beanSearcher.search(GroupsRelationIndependentView.class, MapUtils.flatBuilder(request.getParameterMap())
                 .put("condition", condition)
-                .orderBy(GroupsRelationIndependentView::getIsRenew)
-                .orderBy(GroupsRelationIndependentView::getSubmitTime).desc()
                 .build());
-        search.getDataList().forEach(e->{
-            GroupsTrips groupsTrips = beanSearcher.searchFirst(GroupsTrips.class, MapUtils.builder().field(GroupsTrips::getId, e.getGroupsId()).build());
-            if (groupsTrips != null) {
-                e.setAccount(groupsTrips.getAccount());
-                e.setPassword(groupsTrips.getPassword());
-                e.setAccountExpiryTime(groupsTrips.getExpiryTime());
-            }
-        });
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }