From 154399f83cc1cb709bd98590e524a1d50889307a Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Fri, 31 Jul 2020 00:43:28 +0800
Subject: [PATCH] =?UTF-8?q?up:=201.=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=A2=86=E4=BC=98=E6=83=A0=E5=88=B8=20=20(?=
 =?UTF-8?q?=E4=BC=A0=E6=89=8B=E6=9C=BA=E5=8F=B7:h5=E6=9D=A5=E6=BA=90=20=20?=
 =?UTF-8?q?=E4=BC=A0code:=E5=BE=AE=E4=BF=A1=E6=9D=A5=E6=BA=90)=202.?=
 =?UTF-8?q?=E9=A2=86=E5=8F=96=E4=BC=98=E6=83=A0=E5=88=B8=20(=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AF=E9=A2=86=E5=A5=96=E6=83=85=E5=86=B5=EF=BC=8C=E4=BC=A0?=
 =?UTF-8?q?code=E8=AF=B4=E6=98=8E=E6=98=AF=E5=BE=AE=E4=BF=A1=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../say/service/impl/CouponServiceImpl.java   | 44 ++++++++++++++++---
 1 file changed, 37 insertions(+), 7 deletions(-)

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 3e101db..911d370 100644
--- a/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java
+++ b/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java
@@ -100,8 +100,17 @@ public class CouponServiceImpl extends BaseServiceImpl<CouponMapper, Coupon> imp
                                 users.setPhone(phone);
                                 usersMapper.insert(users);
                             }else {
-                                users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getPhone,phone)
-                                        .and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
+                                if (StringUtils.isBlank(code)){
+                                    //来源H5
+                                    users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getPhone,phone)
+                                            .and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
+                                }else {
+                                    //来源微信
+                                    String unionId = "123";
+                                    users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getUnionId,unionId)
+                                            .and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
+                                }
+
                             }
                             coupon.setUserId(users.getId());
                             coupon.setCreateDateTime(new Date());
@@ -141,17 +150,38 @@ public class CouponServiceImpl extends BaseServiceImpl<CouponMapper, Coupon> imp
             return ajaxResult;
         }else {
             String phone = data.getString("phone");
-            if (StringUtils.isBlank(phone)){
-                ajaxResult.setRetmsg("PHONE MISSING");
+            String code = data.getString("code");
+            if (StringUtils.isBlank(phone)&&StringUtils.isBlank(code)){
+                ajaxResult.setRetmsg("PARAM MISSING");
+                ajaxResult.setRetcode(AjaxResult.FAILED);
+                return ajaxResult;
+            }
+            Users users = new Users();
+            Boolean isWechat = true;
+            if (StringUtils.isNotEmpty(phone)){
+                //来源H5
+                users= usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getPhone,phone)
+                        .and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
+                isWechat = false;
+            }else if (StringUtils.isNotEmpty(code)){
+                //来源微信
+                String unionId = "123";
+                users= usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getUnionId,unionId)
+                        .and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
+            }else {
+                ajaxResult.setRetmsg("PARAM ERROR");
                 ajaxResult.setRetcode(AjaxResult.FAILED);
                 return ajaxResult;
             }
-            Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getPhone,phone)
-                    .and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
             if (users == null){
                 //新会员直接创，肯定没领取过券
                 Users newUsers = new Users();
-                newUsers.setPhone(phone);
+                if (isWechat){
+                    String unionId = "123";
+                    newUsers.setUnionId(unionId);
+                }else {
+                    newUsers.setPhone(phone);
+                }
                 newUsers.setUserType(1);
                 newUsers.setCreateDateTime(new Date());
                 newUsers.setUpdateDateTime(new Date());