diff --git a/src/main/java/com/bsd/say/controller/AwardListController.java b/src/main/java/com/bsd/say/controller/AwardListController.java
index 01b7559..1ec9326 100644
--- a/src/main/java/com/bsd/say/controller/AwardListController.java
+++ b/src/main/java/com/bsd/say/controller/AwardListController.java
@@ -6,6 +6,7 @@ import com.bsd.say.entities.AwardList;
 import com.bsd.say.service.AwardListService;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -36,6 +37,24 @@ public class AwardListController extends BaseController<AwardListService, AwardL
         return ajaxResult;
     }
 
+    /**
+     * 看有没有领取过优惠券
+     */
+    @RequestMapping(value = "/is-award")
+    @ResponseBody
+    public AjaxResult isAward(@RequestBody AjaxRequest ajaxRequest){
+        AjaxResult ajaxResult = new AjaxResult();
+        try {
+            ajaxResult = awardListService.isAward(ajaxRequest);
+        } catch (Exception e) {
+            e.printStackTrace();
+            String errMsg = e.getMessage() != null ? e.getMessage() : "操作失败";
+            ajaxResult.setRetcode(AjaxResult.FAILED);
+            ajaxResult.setRetmsg(errMsg);
+        }
+        return ajaxResult;
+    }
+
     @RequestMapping("award")
     public AjaxResult award(@RequestBody AjaxRequest ajaxRequest){
         AjaxResult ajaxResult = new AjaxResult();
diff --git a/src/main/java/com/bsd/say/service/AwardListService.java b/src/main/java/com/bsd/say/service/AwardListService.java
index b82a860..1e2d309 100644
--- a/src/main/java/com/bsd/say/service/AwardListService.java
+++ b/src/main/java/com/bsd/say/service/AwardListService.java
@@ -6,4 +6,6 @@ import com.bsd.say.entities.AwardList;
 
 public interface AwardListService extends BaseService<AwardList>{
     AjaxResult award(AjaxRequest ajaxRequest);
+
+    AjaxResult isAward(AjaxRequest ajaxRequest);
 }
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 8a4fcfc..313d1a5 100644
--- a/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java
+++ b/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java
@@ -1,24 +1,31 @@
 package com.bsd.say.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.bsd.say.beans.AjaxRequest;
 import com.bsd.say.beans.AjaxResult;
 import com.bsd.say.entities.AwardList;
+import com.bsd.say.entities.Users;
 import com.bsd.say.mapper.AwardListMapper;
+import com.bsd.say.mapper.UsersMapper;
 import com.bsd.say.service.AwardListService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Date;
+import java.util.List;
 
 @Service("awardListService")
 @Transactional
 public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, AwardList> implements AwardListService {
     @Value("${award.rule}")
     private Integer rule;
-
+    @Resource
+    private UsersMapper usersMapper;
     @Autowired
     protected AwardListMapper awardListMapper;
 
@@ -72,4 +79,64 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
             return ajaxResult;
         }
     }
+
+    /**
+     * 判断有没有抽过奖品
+     * @param ajaxRequest
+     * @return
+     */
+    @Override
+    public AjaxResult isAward(AjaxRequest ajaxRequest) {
+        AjaxResult ajaxResult = new AjaxResult();
+        JSONObject data = ajaxRequest.getData();
+        if (data == null){
+            ajaxResult.setRetcode(AjaxResult.FAILED);
+            ajaxResult.setRetmsg("DATA MISSING");
+            return ajaxResult;
+        }else {
+            String phone = data.getString("phone");
+            if (StringUtils.isEmpty(phone)){
+                ajaxResult.setRetcode(AjaxResult.FAILED);
+                ajaxResult.setRetmsg("PHONE MISSING");
+                return ajaxResult;
+            }else {
+                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);
+                    newUsers.setUserType(2);
+                    newUsers.setCreateDateTime(new Date());
+                    newUsers.setUpdateDateTime(new Date());
+                    usersMapper.insert(newUsers);
+                    ajaxResult.setRetmsg("可以抽奖");
+                    ajaxResult.setRetcode(AjaxResult.SUCCESS);
+                    ajaxResult.setData(true);
+                }else {
+                    if (users.getUserType() == 1){
+                        //既是寄件人又是收信人
+                        users.setUserType(3);
+                        usersMapper.updateById(users);
+                    }else if (users.getUserType() == 0){
+                        users.setUserType(2);
+                        usersMapper.updateById(users);
+                    }
+                    List<AwardList> awardList = awardListMapper.selectList(Wrappers.<AwardList>lambdaQuery()
+                            .eq(AwardList::getUserId,users.getId()).and(queryWrapper1 -> queryWrapper1
+                                    .eq(AwardList::getState,1)));
+                    if (awardList.size() == 0 || awardList == null){
+                        ajaxResult.setRetmsg("可以抽奖");
+                        ajaxResult.setRetcode(AjaxResult.SUCCESS);
+                        ajaxResult.setData(true);
+                    }else {
+                        ajaxResult.setRetmsg("已经抽过了");
+                        ajaxResult.setRetcode(AjaxResult.SUCCESS);
+                        ajaxResult.setData(false);
+                    }
+                }
+            }
+        }
+        return ajaxResult;
+    }
 }
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 ea04c26..c670317 100644
--- a/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java
+++ b/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java
@@ -24,6 +24,7 @@ import javax.annotation.Resource;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 @Service("couponService")
 @Transactional
@@ -173,9 +174,17 @@ public class CouponServiceImpl extends BaseServiceImpl<CouponMapper, Coupon> imp
                 ajaxResult.setData(true);
             }else {
                 //老会员
-                Coupon coupon = couponMapper.selectOne(Wrappers.<Coupon>lambdaQuery().eq(Coupon::getUserId,users.getId())
+                if (users.getUserType() == 2){
+                    //既是寄件人又是收信人
+                    users.setUserType(3);
+                    usersMapper.updateById(users);
+                }else if (users.getUserType() == 0){
+                    users.setUserType(1);
+                    usersMapper.updateById(users);
+                }
+                List<Coupon> coupons = couponMapper.selectList(Wrappers.<Coupon>lambdaQuery().eq(Coupon::getUserId,users.getId())
                         .and(queryWrapper1 -> queryWrapper1.eq(Coupon::getState,1)));
-                if (coupon == null){
+                if (coupons.size() == 0 || coupons == null){
                     ajaxResult.setRetmsg("可以领取优惠券");
                     ajaxResult.setRetcode(AjaxResult.SUCCESS);
                     ajaxResult.setData(true);