Compare commits

..

No commits in common. 'b1d1236f0ca03002e0c5883215244b0064bc8537' and '73cd369bd0732a5bb42c8922fbe0d419b5ebb516' have entirely different histories.

@ -5,10 +5,7 @@ import com.bsd.say.beans.AjaxResult;
import com.bsd.say.entities.Users; import com.bsd.say.entities.Users;
public interface UsersService extends BaseService<Users>{ public interface UsersService extends BaseService<Users>{
AjaxResult sendNote(AjaxRequest ajaxRequest); AjaxResult sendNote(AjaxRequest ajaxRequest);
AjaxResult isSubscribe(AjaxRequest ajaxRequest); AjaxResult isSubscribe(AjaxRequest ajaxRequest);
AjaxResult getUserInfoByOpenId(AjaxRequest ajaxRequest); AjaxResult getUserInfoByOpenId(AjaxRequest ajaxRequest);
} }

@ -135,13 +135,16 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
ajaxResult.setRetmsg("openId MISSING"); ajaxResult.setRetmsg("openId MISSING");
return ajaxResult; return ajaxResult;
} else { } else {
JSONObject userInfo = weixinService.getUserInfoByOpenId(openId);
// String unionId = userInfo.getString("unionid");
// logger.info("union_id:"+unionId);
Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getOpenId,openId) Users users = usersMapper.selectOne(Wrappers.<Users>lambdaQuery().eq(Users::getOpenId,openId)
.and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1))); .and(queryWrapper1 -> queryWrapper1.eq(Users::getState,1)));
if (users == null){ if (users == null){
//新会员直接创,肯定没抽过奖 //新会员直接创,肯定没抽过奖
Users newUsers = new Users(); Users newUsers = new Users();
newUsers.setOpenId(openId); newUsers.setOpenId(openId);
// newUsers.setUnionId(unionId);
newUsers.setUserType(2); newUsers.setUserType(2);
newUsers.setCreateDateTime(new Date()); newUsers.setCreateDateTime(new Date());
newUsers.setUpdateDateTime(new Date()); newUsers.setUpdateDateTime(new Date());

@ -8,10 +8,10 @@ import com.bsd.say.entities.Record;
import com.bsd.say.entities.Users; import com.bsd.say.entities.Users;
import com.bsd.say.mapper.RecordMapper; import com.bsd.say.mapper.RecordMapper;
import com.bsd.say.mapper.UsersMapper; import com.bsd.say.mapper.UsersMapper;
import com.bsd.say.service.RedisService;
import com.bsd.say.service.UsersService; import com.bsd.say.service.UsersService;
import com.bsd.say.util.HttpRequestUtils; import com.bsd.say.util.HttpRequestUtils;
import com.bsd.say.util.MD5Utils; import com.bsd.say.util.MD5Utils;
import com.sun.org.apache.bcel.internal.generic.NEW;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -28,8 +28,6 @@ import java.util.concurrent.TimeUnit;
@Service("usersService") @Service("usersService")
@Transactional @Transactional
public class UsersServiceImpl extends BaseServiceImpl<UsersMapper,Users> implements UsersService { public class UsersServiceImpl extends BaseServiceImpl<UsersMapper,Users> implements UsersService {
@Resource @Resource
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
@Value("${bsd.tokenkey}") @Value("${bsd.tokenkey}")
@ -46,10 +44,6 @@ public class UsersServiceImpl extends BaseServiceImpl<UsersMapper, Users> implem
private WeixinService weixinService; private WeixinService weixinService;
@Resource @Resource
private RecordMapper recordMapper; private RecordMapper recordMapper;
@Resource
private RedisService redisService;
static final String RECORD_PREFIX = "BSD_RECORD_";
@Override @Override
public UsersMapper getBaseMapper() { public UsersMapper getBaseMapper() {
@ -58,7 +52,6 @@ public class UsersServiceImpl extends BaseServiceImpl<UsersMapper, Users> implem
/** /**
* *
*
* @param ajaxRequest * @param ajaxRequest
* @return * @return
*/ */
@ -134,13 +127,11 @@ public class UsersServiceImpl extends BaseServiceImpl<UsersMapper, Users> implem
/** /**
* openIdrecordname phone * openIdrecordname phone
*
* @param ajaxRequest * @param ajaxRequest
* @return * @return
*/ */
@Override @Override
public AjaxResult getUserInfoByOpenId(AjaxRequest ajaxRequest) { public AjaxResult getUserInfoByOpenId(AjaxRequest ajaxRequest) {
AjaxResult ajaxResult = new AjaxResult(); AjaxResult ajaxResult = new AjaxResult();
JSONObject data = ajaxRequest.getData(); JSONObject data = ajaxRequest.getData();
if (data == null){ if (data == null){
@ -149,13 +140,6 @@ public class UsersServiceImpl extends BaseServiceImpl<UsersMapper, Users> implem
return ajaxResult; return ajaxResult;
}else { }else {
String openId = data.getString("openId"); String openId = data.getString("openId");
if (redisService.exists(RECORD_PREFIX + openId)) {
String userInfoStr = redisService.get(RECORD_PREFIX + openId).toString();
ajaxResult.setData(JSONObject.parseObject(userInfoStr));
ajaxResult.setRetcode(AjaxResult.SUCCESS);
} else {
if (StringUtils.isBlank(openId)){ if (StringUtils.isBlank(openId)){
ajaxResult.setRetcode(AjaxResult.FAILED); ajaxResult.setRetcode(AjaxResult.FAILED);
ajaxResult.setRetmsg("openId missing"); ajaxResult.setRetmsg("openId missing");
@ -168,12 +152,10 @@ public class UsersServiceImpl extends BaseServiceImpl<UsersMapper, Users> implem
userInfo.put("name",record.getName()); userInfo.put("name",record.getName());
userInfo.put("phone",record.getPhone()); userInfo.put("phone",record.getPhone());
} }
redisService.set(RECORD_PREFIX + openId, userInfo.toJSONString());
ajaxResult.setData(userInfo); ajaxResult.setData(userInfo);
ajaxResult.setRetcode(AjaxResult.SUCCESS); ajaxResult.setRetcode(AjaxResult.SUCCESS);
} }
} }
}
return ajaxResult; return ajaxResult;
} }

@ -1,3 +1,3 @@
spring: spring:
profiles: profiles:
active: prod active: dev
Loading…
Cancel
Save