拼团人数

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，即开团人）
      */

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java

@@ -175,7 +175,7 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> 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("拼团失败，该拼团单不存在或已结束");
             }
         }