Explorar o código

fix 更换车票独立车位过滤未有空位

zoujiajian %!s(int64=2) %!d(string=hai) anos
pai
achega
2830e8fc34

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -462,7 +462,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
         //获取新车队车位
         GroupsRelation newRelation;
         Boolean isOutside = req.getIsOutside();
-        if (Constant.AI_goodsIds.contains(orderDon.getGoodsId()) && ((isOutside != null && isOutside) || groups.getAvailableNum() == 0)) {
+        if (Constant.AI_goodsIds.contains(orderDon.getGoodsId()) && ((isOutside != null && isOutside) || groups.getAvailableNum() == 0) && groups.getNum() > 1) {
             //Ai车队 额外增加车位 并不让上车
             newRelation = getChatGPTOutsideRelation(orderDon.getUserId(), groupId, relationNum, 1);
         } else {

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

@@ -642,7 +642,7 @@ public class CmsOrderController {
 			builder.orderBy(AccountView::getExpiryTime).asc();
 		}
 		GoodsDonSku sku = skuMapper.selectById(skuId);
-		if (!Constant.AI_goodsIds.contains(sku.getGoodsId())) {
+		if (sku.getNum() == 1 || !Constant.AI_goodsIds.contains(sku.getGoodsId())) {
 			builder.field(EmptyGroupsRelationView::getAvailableNum, 0).op(Operator.GreaterThan);
 		}
 		SearchResult<EmptyGroupsRelationView> search = beanSearcher.search(EmptyGroupsRelationView.class,