|
|
|
@ -79,7 +79,7 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
|
|
|
|
|
JSONObject userInfo = weixinService.getUserInfoByOpenId(openId);
|
|
|
|
|
String unionId = userInfo.getString("unionid");
|
|
|
|
|
logger.info("union_id:"+unionId);
|
|
|
|
|
Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getUnionId,unionId)
|
|
|
|
|
Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getOpenId,openId)
|
|
|
|
|
.and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
|
|
|
|
|
AwardList maxIdAward = awardListMapper.selectByMaxId();
|
|
|
|
|
Integer newAwardNumner = maxIdAward.getAwardNumber()+ 1;
|
|
|
|
@ -138,11 +138,12 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
|
|
|
|
|
JSONObject userInfo = weixinService.getUserInfoByOpenId(openId);
|
|
|
|
|
String unionId = userInfo.getString("unionid");
|
|
|
|
|
logger.info("union_id:"+unionId);
|
|
|
|
|
Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getUnionId,unionId)
|
|
|
|
|
Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getOpenId,openId)
|
|
|
|
|
.and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
|
|
|
|
|
if (users == null){
|
|
|
|
|
//新会员直接创,肯定没抽过奖
|
|
|
|
|
Users newUsers = new Users();
|
|
|
|
|
newUsers.setOpenId(openId);
|
|
|
|
|
newUsers.setUnionId(unionId);
|
|
|
|
|
newUsers.setUserType(2);
|
|
|
|
|
newUsers.setCreateDateTime(new Date());
|
|
|
|
@ -210,7 +211,7 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
|
|
|
|
|
String unionId = userInfo.getString("unionid");
|
|
|
|
|
// String unionId = weixinService.getUnionId(openId);
|
|
|
|
|
logger.info("union_id:"+unionId);
|
|
|
|
|
Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getUnionId,unionId)
|
|
|
|
|
Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getOpenId,openId)
|
|
|
|
|
.and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
|
|
|
|
|
if (users == null){
|
|
|
|
|
ajaxResult.setRetcode(AjaxResult.FAILED);
|
|
|
|
@ -279,7 +280,7 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
|
|
|
|
|
JSONObject userInfo = weixinService.getUserInfoByOpenId(openId);
|
|
|
|
|
String unionId = userInfo.getString("unionid");
|
|
|
|
|
logger.info("union_id:"+unionId);
|
|
|
|
|
Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getUnionId,unionId)
|
|
|
|
|
Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getOpenId,openId)
|
|
|
|
|
.and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
|
|
|
|
|
if (users == null){
|
|
|
|
|
ajaxResult.setRetcode(AjaxResult.SUCCESS);
|
|
|
|
|