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 BaseServiceImpllambdaQuery().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 BaseServiceImpllambdaQuery().eq(Users::getPhone,phone) + } else { + String unionId = ""; + Users users = usersMapper.selectOne(Wrappers.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 imp } /** - * 有没有领取过优惠券 + * 有没有领取过优惠券 领取优惠券手机号必传 * @param ajaxRequest * @return */