From 2f4d9e4d7036c3bdadd29d0b848294a0f73083d8 Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Sun, 8 Dec 2019 19:52:24 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=9B=A2=E8=B4=AD=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../linlinjava/litemall/wx/service/WxOrderService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java index f19ef415..31630723 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java @@ -279,15 +279,21 @@ public class WxOrderService { if (grouponLinkId != null && grouponLinkId > 0) { //团购人数已满 - if(grouponService.countGroupon(grouponLinkId) >= rules.getDiscountMember()){ + if(grouponService.countGroupon(grouponLinkId) >= (rules.getDiscountMember() - 1)){ return ResponseUtil.fail(GROUPON_FULL, "团购活动人数已满!"); } // NOTE // 这里业务方面允许用户多次开团，以及多次参团， - // 但是不允许参加已经参加过的团购 + // 但是会限制以下两点： + // （1）不允许参加已经加入的团购 if(grouponService.hasJoin(userId, grouponLinkId)){ return ResponseUtil.fail(GROUPON_JOIN, "团购活动已经参加!"); } + // （2）不允许参加自己开团的团购 + LitemallGroupon groupon = grouponService.queryById(grouponLinkId); + if(groupon.getCreatorUserId().equals(userId)){ + return ResponseUtil.fail(GROUPON_JOIN, "团购活动已经参加!"); + } } }