zoujiajian 3 vuotta sitten
vanhempi
sitoutus
89a88a598f

+ 3 - 0
netflix-web/src/main/java/com/cyksj/web/controller/group/GroupController.java

@@ -4,10 +4,12 @@ import com.cyksj.common.constant.Constant;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.GoodsDonSkuMapper;
+import com.cyksj.model.entity.GroupsRelation;
 import com.cyksj.model.manage.views.GroupsRelationView;
 import com.cyksj.model.views.GroupsView;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -44,6 +46,7 @@ public class GroupController {
             if (Constant.CHAT_GPT_SKU_IDS.contains(groupsView.getSkuId())) {
                 List<GroupsRelationView> relationViewList = beanSearcher.searchAll(GroupsRelationView.class, MapUtils.builder()
                         .field(GroupsRelationView::getGroupsId, groupsView.getId())
+                        .field(GroupsRelationView::getStatus, GroupsRelation.Status.outside.name()).op(Operator.NotEqual)
                         .orderBy(GroupsRelationView::getUpdate_time).desc()
                         .build());
                 List<GroupsRelationView> all = null;

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

@@ -218,7 +218,7 @@ public class CmsGroupController {
      * 下架车队
      */
     @PutMapping("/down/trips/{groupsId}")
-    public Result<String> setGroupsDown(Long groupsId) {
+    public Result<String> setGroupsDown(@PathVariable Long groupsId) {
         groupService.update(null, Wrappers.lambdaUpdate(GroupsTrips.class)
                 .set(GroupsTrips::getStatus, GroupsTrips.Status.down)
                 .eq(GroupsTrips::getId, groupsId));