diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbWareOrderVO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbWareOrderVO.java index 948b6668c..2731f8e9b 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbWareOrderVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbWareOrderVO.java @@ -26,6 +26,10 @@ public class GbWareOrderVO { * 团单编号 */ private String groupOrderNo; + /** + * 要求成团人数 + */ + private Integer groupPeopleNum; /** * 现有人数(初始为1,即开团人) */ diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java index 971291d13..1cd31f6e4 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java @@ -175,7 +175,7 @@ public class GbOrderServiceImpl extends ServiceImpl impl if (StrUtil.isNotBlank(param.getGroupOrderNo())) { GbOrder order = getOne(query().eq(GbOrder::getGroupOrderNo, param.getGroupOrderNo()) .eq(GbOrder::getShopId, param.getShopId())); - if (order == null || !"ing".equals(order.getStatus())) { + if (order == null || !"ing".equals(order.getStatus()) || order.getGroupEndTime().isBefore(LocalDateTime.now())) { throw new CzgException("拼团失败,该拼团单不存在或已结束"); } }