fix 独立车位上车后，自动下架

netflix-service/src/main/java/com/cyksj/service/mange/group/CmsGroupServiceImpl.java

@@ -280,16 +280,27 @@ public class CmsGroupServiceImpl extends ServiceImpl<GroupsMapper,GroupsTrips> i
        groupsTrips.setStatus(GroupsTrips.Status.validity);
         GoodsDonSku sku = skuMapper.selectById(groupsTrips.getSkuId());
         //下架上过车的POE,PS AI账号 || GPT Plus独立规格 下架
-        if (Constant.DOWN_GOODS_PAY.contains(sku.getGoodsId()) || skuMapper.selectSingleSkuIdsByGoodsId(Constant.AI_goodsIds.get(0)).contains(groupsTrips.getSkuId())) {
-            Number number = beanSearcher.searchCount(GroupsRelation.class, MapUtils.builder()
-                    .field(GroupsRelation::getGroupsId, groupsTrips.getId())
-                    .field(GroupsRelation::getUserId, 0).op(Operator.NotEqual)
-                    .field(GroupsRelation::getStatus, GroupsRelation.Status.validity.name())
-                    .build());
-            if (number.intValue() > 0) {
-                groupsTrips.setStatus(GroupsTrips.Status.down);
-            }
-        }
+//        if (Constant.DOWN_GOODS_PAY.contains(sku.getGoodsId()) || skuMapper.selectSingleSkuIdsByGoodsId(Constant.AI_goodsIds.get(0)).contains(groupsTrips.getSkuId())) {
+//            Number number = beanSearcher.searchCount(GroupsRelation.class, MapUtils.builder()
+//                    .field(GroupsRelation::getGroupsId, groupsTrips.getId())
+//                    .field(GroupsRelation::getUserId, 0).op(Operator.NotEqual)
+//                    .field(GroupsRelation::getStatus, GroupsRelation.Status.validity.name())
+//                    .build());
+//            if (number.intValue() > 0) {
+//                groupsTrips.setStatus(GroupsTrips.Status.down);
+//            }
+//        }
+	    //独立车位 车队下架
+	    if (sku.getNum() != null && sku.getNum() == 1) {
+		    Number number = beanSearcher.searchCount(GroupsRelation.class, MapUtils.builder()
+				    .field(GroupsRelation::getGroupsId, groupsTrips.getId())
+				    .field(GroupsRelation::getUserId, 0).op(Operator.NotEqual)
+				    .field(GroupsRelation::getStatus, GroupsRelation.Status.validity.name())
+				    .build());
+		    if (number.intValue() > 0) {
+			    groupsTrips.setStatus(GroupsTrips.Status.down);
+		    }
+	    }
        updateById(groupsTrips);
 
         GoodsDon goodsDon = goodsDonMapper.selectById(account.getGoodsId());

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -1478,8 +1478,15 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 						order.setStatus(OrderDon.Status.complete);
 					}
 				}
-				//下架POE会员车队 || GPT Plus独立规格 下架
-				if (order.getGoodsId() != null && Constant.DOWN_GOODS_PAY.contains(order.getGoodsId()) || goodsDonSkuMapper.selectSingleSkuIdsByGoodsId(Constant.AI_goodsIds.get(0)).contains(groupsTrips.getSkuId())) {
+//				//下架POE会员车队 || GPT Plus独立规格 下架
+//				if (order.getGoodsId() != null && Constant.DOWN_GOODS_PAY.contains(order.getGoodsId()) || goodsDonSkuMapper.selectSingleSkuIdsByGoodsId(Constant.AI_goodsIds.get(0)).contains(groupsTrips.getSkuId())) {
+//					if (groupsTrips.getAccountId() != null && groupsTrips.getStatus() == GroupsTrips.Status.validity) {
+//						groupsTrips.setStatus(GroupsTrips.Status.down);
+//						groupsMapper.updateById(groupsTrips);
+//					}
+//				}
+				//独立车位下单后 车队下架
+				if (sku.getNum() != null && sku.getNum() == 1) {
 					if (groupsTrips.getAccountId() != null && groupsTrips.getStatus() == GroupsTrips.Status.validity) {
 						groupsTrips.setStatus(GroupsTrips.Status.down);
 						groupsMapper.updateById(groupsTrips);