|
@@ -109,14 +109,11 @@ public class QywxUserDataService {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- // 2. 解析内层用户数据
|
|
|
UserData userData = JSON.parseObject(wrapperData.getJson(), UserData.class);
|
|
|
-
|
|
|
- // 3. 处理用户基础信息
|
|
|
- UserBase userBase = processBaseInfo(wrapperData, userData);
|
|
|
+ processBaseInfo(wrapperData, userData);
|
|
|
}
|
|
|
|
|
|
- private UserBase processBaseInfo(QwCallBackWrapperData envelop, UserData data) {
|
|
|
+ private void processBaseInfo(QwCallBackWrapperData envelop, UserData data) {
|
|
|
UserBase userBase = new UserBase();
|
|
|
userBase.setUuid(envelop.getUuid());
|
|
|
userBase.setVid(data.vid.toString());
|
|
@@ -138,9 +135,8 @@ public class QywxUserDataService {
|
|
|
|
|
|
// 查询是否已存在
|
|
|
UserBaseExample example = new UserBaseExample();
|
|
|
- example.createCriteria().andUuidEqualTo(envelop.getUuid());
|
|
|
+ example.createCriteria().andVidEqualTo(data.vid.toString());
|
|
|
List<UserBase> existUsers = userBaseMapper.selectByExample(example);
|
|
|
-
|
|
|
if (!existUsers.isEmpty()) {
|
|
|
UserBase existUser = existUsers.get(0);
|
|
|
userBase.setId(existUser.getId());
|
|
@@ -149,7 +145,6 @@ public class QywxUserDataService {
|
|
|
} else {
|
|
|
userBaseMapper.insertSelective(userBase);
|
|
|
}
|
|
|
- return userBase;
|
|
|
}
|
|
|
|
|
|
public void cancelScanCode(String originalJson) {
|