From ed654b1823f4a005324c38f58ba7e042f521d6f5 Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Thu, 30 Jul 2020 20:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=A8=A1=E5=9D=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9:=20=E4=BB=8Ephone=E5=BF=85=E4=BC=A0=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?code=EF=BC=8C=E5=90=8E=E8=8E=B7=E5=8F=96unionId=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bsd/say/entities/AwardList.java  |  2 +-
 .../service/impl/AwardListServiceImpl.java    | 28 +++++++++++--------
 .../say/service/impl/CouponServiceImpl.java   |  2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/bsd/say/entities/AwardList.java b/src/main/java/com/bsd/say/entities/AwardList.java
index db26f1b..b85ab11 100644
--- a/src/main/java/com/bsd/say/entities/AwardList.java
+++ b/src/main/java/com/bsd/say/entities/AwardList.java
@@ -9,7 +9,7 @@ public class AwardList extends BaseEntity{
     /**
      * 中奖用户id
      */
-    private Integer userId;
+    private Long userId;
 
     /**
      * 中奖类型(1-一等奖  2-二等奖)
diff --git a/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java b/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java
index 313d1a5..13d2327 100644
--- a/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java
+++ b/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java
@@ -49,16 +49,19 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
                 ajaxResult.setRetmsg("DATA MISSING");
                 return ajaxResult;
             }else {
-                Integer userId = data.getInteger("userId");
-                if (userId == null){
+                String code = data.getString("code");
+                if (StringUtils.isEmpty(code)){
                     ajaxResult.setRetcode(AjaxResult.FAILED);
-                    ajaxResult.setRetmsg("USERID MISSING");
+                    ajaxResult.setRetmsg("CODE MISSING");
                     return ajaxResult;
-                }else {
+                } else {
+                    String unionId = "";
+                    Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getUnionId,unionId)
+                            .and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
                     AwardList maxIdAward = awardListMapper.selectByMaxId();
                     Integer newAwardNumner = maxIdAward.getAwardNumber()+ 1;
                     AwardList awardList = new AwardList();
-                    awardList.setUserId(userId);
+                    awardList.setUserId(users.getId());
                     awardList.setAwardNumber(newAwardNumner);
                     awardList.setCreateDateTime(new Date());
                     awardList.setUpdateDateTime(new Date());
@@ -81,7 +84,7 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
     }
 
     /**
-     * 判断有没有抽过奖品
+     * 判断有没有抽过奖品 微信code必传
      * @param ajaxRequest
      * @return
      */
@@ -94,18 +97,19 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
             ajaxResult.setRetmsg("DATA MISSING");
             return ajaxResult;
         }else {
-            String phone = data.getString("phone");
-            if (StringUtils.isEmpty(phone)){
+            String code = data.getString("code");
+            if (StringUtils.isEmpty(code)){
                 ajaxResult.setRetcode(AjaxResult.FAILED);
-                ajaxResult.setRetmsg("PHONE MISSING");
+                ajaxResult.setRetmsg("CODE MISSING");
                 return ajaxResult;
-            }else {
-                Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getPhone,phone)
+            } else {
+                String unionId = "";
+                Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getUnionId,unionId)
                         .and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
                 if (users == null){
                     //新会员直接创，肯定没抽过奖
                     Users newUsers = new Users();
-                    newUsers.setPhone(phone);
+                    newUsers.setUnionId(unionId);
                     newUsers.setUserType(2);
                     newUsers.setCreateDateTime(new Date());
                     newUsers.setUpdateDateTime(new Date());
diff --git a/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java b/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java
index c670317..e91fc3e 100644
--- a/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java
+++ b/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java
@@ -145,7 +145,7 @@ public class CouponServiceImpl extends BaseServiceImpl<CouponMapper, Coupon> imp
     }
 
     /**
-     * 有没有领取过优惠券
+     * 有没有领取过优惠券  领取优惠券手机号必传
      * @param ajaxRequest
      * @return
      */