init
This commit is contained in:
@@ -125,24 +125,6 @@ public class WxTransDataServiceImpl extends ServiceImpl<WxTransDataMapper,WxTran
|
|||||||
vo.setCreateTime(record.getCreateTime());
|
vo.setCreateTime(record.getCreateTime());
|
||||||
vo.setStatus(record.getStatus());
|
vo.setStatus(record.getStatus());
|
||||||
if(record.getSponsorUserId().equals(userId)){
|
if(record.getSponsorUserId().equals(userId)){
|
||||||
vo.setUserId(record.getSponsorUserId());
|
|
||||||
vo.setUsercode(record.getSponsorUsercode());
|
|
||||||
User user = userMap.get(record.getSponsorUserId());
|
|
||||||
if(user != null){
|
|
||||||
vo.setAvatar(user.getAvatar());
|
|
||||||
vo.setGender(user.getGender());
|
|
||||||
vo.setNickname(user.getNickname());
|
|
||||||
vo.setBirthday(user.getBirthday());
|
|
||||||
vo.setBirthdayStr(BirthdayUtil.getMinBirthday(user.getBirthday()));
|
|
||||||
vo.setAge(BirthdayUtil.getAge(user.getBirthday()));
|
|
||||||
vo.setResidenceCityName(user.getResidenceCityName());
|
|
||||||
vo.setEducation(user.getEducation());
|
|
||||||
vo.setProfession(user.getProfession());
|
|
||||||
}
|
|
||||||
if(WxTransDataStatusEnum.SUCCESS.getCode().equals(record.getStatus())){
|
|
||||||
vo.setWxCode(record.getReceiveWx());
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
vo.setUserId(record.getReceiveUserId());
|
vo.setUserId(record.getReceiveUserId());
|
||||||
vo.setUsercode(record.getReceiveUsercode());
|
vo.setUsercode(record.getReceiveUsercode());
|
||||||
User user = userMap.get(record.getReceiveUserId());
|
User user = userMap.get(record.getReceiveUserId());
|
||||||
@@ -160,6 +142,24 @@ public class WxTransDataServiceImpl extends ServiceImpl<WxTransDataMapper,WxTran
|
|||||||
if(WxTransDataStatusEnum.SUCCESS.getCode().equals(record.getStatus())){
|
if(WxTransDataStatusEnum.SUCCESS.getCode().equals(record.getStatus())){
|
||||||
vo.setWxCode(record.getSponsorWx());
|
vo.setWxCode(record.getSponsorWx());
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
vo.setUserId(record.getSponsorUserId());
|
||||||
|
vo.setUsercode(record.getSponsorUsercode());
|
||||||
|
User user = userMap.get(record.getSponsorUserId());
|
||||||
|
if(user != null){
|
||||||
|
vo.setAvatar(user.getAvatar());
|
||||||
|
vo.setGender(user.getGender());
|
||||||
|
vo.setNickname(user.getNickname());
|
||||||
|
vo.setBirthday(user.getBirthday());
|
||||||
|
vo.setBirthdayStr(BirthdayUtil.getMinBirthday(user.getBirthday()));
|
||||||
|
vo.setAge(BirthdayUtil.getAge(user.getBirthday()));
|
||||||
|
vo.setResidenceCityName(user.getResidenceCityName());
|
||||||
|
vo.setEducation(user.getEducation());
|
||||||
|
vo.setProfession(user.getProfession());
|
||||||
|
}
|
||||||
|
if(WxTransDataStatusEnum.SUCCESS.getCode().equals(record.getStatus())){
|
||||||
|
vo.setWxCode(record.getReceiveWx());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
res.add(vo);
|
res.add(vo);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user