下架车队

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

@@ -1,5 +1,6 @@
 package com.cyksj.model.manage.views;
 
+import com.cyksj.model.entity.GroupsTrips;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
@@ -90,6 +91,9 @@ public class AccountView {
     @DbField("gt.id")
     private Long groupsId;
 
+    @DbField("gt.status")
+    private GroupsTrips.Status gtStatus;
+
     /**
      * 账号备注
      */

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

@@ -94,6 +94,9 @@ public class GroupRelationClearServiceImpl implements GroupRelationClearService
 				userTicketClearedRecord.setStartTime(startTime);
 				userTicketClearedRecord.setExpiryTime(expireTime);
 				userTicketClearedRecord.setNewRelationId(newRelationId);
+				if (source == UserTicketClearedRecord.Source.change_ticket) {
+					userTicketClearedRecord.setDeleted(false);
+				}
 				userTicketClearedRecordMapper.insert(userTicketClearedRecord);
 //				if (!isFlag) {
 //					//清除之前规格的车队

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

@@ -79,6 +79,7 @@ public class CmsGroupController {
 
         SearchResult<GroupsTrips> search = beanSearcher.search(GroupsTrips.class, mapBuilder
                 .field(GroupsTrips::getAccount, StringUtils.isBlank(account) ? null : account).op(Operator.EndWith)
+                .field(GroupsTrips::getStatus, GroupsTrips.Status.down.name()).op(Operator.NotEqual)
                 .build()
         );
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
@@ -213,6 +214,17 @@ public class CmsGroupController {
         return GatewayResponse.SUCCESS.newBuilder().toResult("上架成功");
     }
 
+    /**
+     * 下架车队
+     */
+    @PutMapping("/down/trips/{groupsId}")
+    public Result<String> setGroupsDown(Long groupsId) {
+        groupService.update(null, Wrappers.lambdaUpdate(GroupsTrips.class)
+                .set(GroupsTrips::getStatus, GroupsTrips.Status.down)
+                .eq(GroupsTrips::getId, groupsId));
+        return GatewayResponse.SUCCESS.newBuilder().toResult("下架成功");
+    }
+
     /**
      * 弃用账号
      */
@@ -223,7 +235,7 @@ public class CmsGroupController {
                 .set(Account::getIsAbandon, true)
                 .eq(Account::getIsAbandon, false)
                 .eq(Account::getId, accountId));
-        return GatewayResponse.SUCCESS.newBuilder().toResult("下架成功");
+        return GatewayResponse.SUCCESS.newBuilder().toResult("弃用成功");
     }
 
     /**