fix 添加过期账号启用

netflix-dao/src/main/java/com/cyksj/model/entity/Account.java

@@ -70,4 +70,9 @@ public class Account extends BaseEntity {
      * gpt API 密钥
      */
     private String apiSecret;
+
+    /**
+     * 账号是否被弃用
+     */
+    private Boolean isAbandon;
 }

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

@@ -56,4 +56,10 @@ public class CloseGroupsTripsView {
 
 	@DbField("a.expiry_time")
 	private Date expiryTime;
+
+	/**
+	 * 废弃车队
+	 */
+	@DbField("a.is_abandon")
+	private Boolean isAbandon;
 }

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

@@ -189,7 +189,9 @@ public class CmsGroupController {
     @GetMapping("/get/down/trips")
     public Result<SearchResult<CloseGroupsTripsView>> getDownGroups() {
         SearchResult<CloseGroupsTripsView> search = beanSearcher.search(CloseGroupsTripsView.class, MapUtils.flatBuilder(request.getParameterMap())
-                .field(CloseGroupsTripsView::getGroupsStatus, GroupsTrips.Status.down.name()).build());
+                .field(CloseGroupsTripsView::getGroupsStatus, GroupsTrips.Status.down.name())
+                .orderBy(CloseGroupsTripsView::getIsAbandon).asc()
+                .build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }
 
@@ -205,4 +207,17 @@ public class CmsGroupController {
                 .eq(GroupsTrips::getId, groupsId));
         return GatewayResponse.SUCCESS.newBuilder().toResult("上架成功");
     }
+
+    /**
+     * 弃用账号
+     */
+    @PutMapping("/down/account/{accountId}")
+    @Log(module = "过期账号/废弃过期车队", businessType = BusinessType.PUT, isSaveRequestData = true)
+    public Result<String> putDownAccount(@PathVariable Long accountId) {
+        accountService.update(null, Wrappers.lambdaUpdate(Account.class)
+                .set(Account::getIsAbandon, true)
+                .eq(Account::getIsAbandon, false)
+                .eq(Account::getId, accountId));
+        return GatewayResponse.SUCCESS.newBuilder().toResult("下架成功");
+    }
 }