From 27e6d275d1aa136b4a161554bc1faf6379826c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=91=E7=A8=BD=E5=88=98?= <1073236926@qq.com>
Date: Thu, 2 Jul 2020 21:08:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=8A=A0=E5=85=A5=E8=87=AA?=
 =?UTF-8?q?=E5=B7=B1=E5=BC=80=E5=9B=A2=E5=9B=A2=E8=B4=AD=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=88=A4=E7=A9=BA=EF=BC=8C=E5=90=A6=E5=88=99?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95=E6=83=A8=E5=9B=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../linlinjava/litemall/wx/service/WxOrderService.java   | 9 +++++++--
 1 file changed, 7 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 739a0d04..d83b51b8 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
@@ -290,8 +290,13 @@ public class WxOrderService {
                 }
                 // （2）不允许参加自己开团的团购
                 LitemallGroupon groupon = grouponService.queryById(userId, grouponLinkId);
-                if(groupon.getCreatorUserId().equals(userId)){
-                    return ResponseUtil.fail(GROUPON_JOIN, "团购活动已经参加!");
+                // if(groupon.getCreatorUserId().equals(userId)){
+                //     return ResponseUtil.fail(GROUPON_JOIN, "团购活动已经参加!");
+                // }
+                if(groupon!=null) {
+	                if(groupon.getCreatorUserId().equals(userId)){
+	                    return ResponseUtil.fail(GROUPON_JOIN, "团购活动已经参加!");
+	                }
                 }
             }
         }
-- 
Gitee