Skip to content

向汉 / uc-consumer

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 1e729a4f 1e729a4fbaf4f4eb5d182b1d6fadb9f3455978ba by xianghan
Options

1.修改判空条件

1 parent 1e30cfe4
Inline Side-by-side
Showing 3 changed files with 39 additions and 20 deletions
......@@ -61,8 +61,6 @@ public class MemberServiceImpl implements MemberService {
@Override
public MemberDTO findById(Long id) {
Member member = this.memberRepository.findById(id).orElseGet(Member::new);
ValidationUtil.isNull(member.getId(),"Member","id",id);
return this.memberMapper.toDto(member);
}
......@@ -73,13 +71,6 @@ public class MemberServiceImpl implements MemberService {
return this.memberMapper.toDto(member);
}
private MemberDTO findByIdOrCode(Long id, String code) {
Member member = this.memberRepository.findByIdOrCode(id,code).orElseGet(Member::new);
ValidationUtil.isNull(member.getId(),"Member","param",code);
return this.memberMapper.toDto(member);
}
@Override
public MemberDTO checkMember(Long id, String memberCode) {
......
......@@ -45,7 +45,7 @@ public class UserWeixinServiceImpl implements UserWeixinService {
@Transactional(rollbackFor = Exception.class)
public UserWeixin create(UserWeixin resources) {
MemberDTO memberDTO = memberService.findByCode(resources.getMemberCode());
if (Objects.nonNull(memberDTO)) {
if (Objects.nonNull(memberDTO.getId())) {
Long id = memberDTO.getId();
resources.setMemberId(id);
}
......
......@@ -43,33 +43,59 @@ public class UserOperationServiceImpl implements UserOperationService {
@Autowired
private MemberProfileService memberProfileService;
/* {"entityBody":"{\"memberDTO\":{\"birthday\":\"1900-01-01\",\"blackStatus\":0,\"code\":\"1540299597507502080\"," +
"\"couponAmount\":0,\"createTime\":1656071016149,\"dueCouponAmount\":0,\"duePoints\":0,\"exp\":0,\"gender\":-1," +
"\"id\":62515,\"level\":1,\"points\":0,\"status\":1," +
"\"type\":2,\"updateTime\":1656071016149,\"vip\":0}," +
"" +
"\"userWeixinDTO\":{\"accessToken\":\"\",\"appid\":\"wx0f7db04bbc5aa004\"," +
"\"city\":\"\",\"country\":\"\",\"createBy\":\"system\"," +
"\"createTime\":1656071016625,\"description\":\"\"," +
"\"headimgurl\":\"\",\"id\":127987," +
"\"memberCode\":\"1540299597507502080\"," +
"\"memberId\":62515,\"nickname\":\"\"," +
"\"openid\":\"oJ4Pl4rRiLHLfPx2Zey0YUC-89T0\"," +
"\"privilege\":\"\",\"province\":\"\"," +
"\"refreshToken\":\"\",\"sex\":-1,\"sourceDesc\":\"\",\"sourceEntity\":\"\"," +
"\"sourceId\":\"\",\"sourceType\":\"\",\"sourceUser\":0,\"status\":0,\"syncStatus\":0," +
"\"unionid\":\"oqDha5lxMuXYMGgT6gyLIFL7VumM\",\"updateBy\":\"system\",\"updateTime\":1656071016625}}*/
@Transactional(propagation = Propagation.SUPPORTS, rollbackFor = Exception.class)
public void asyncMemberAndUserWeixin4Iptv(MemberAndWeixinUserDTO memberAndWeixinUserDTO) {
log.info("保存微信账号并同时创建会员信息 ==>> {}", memberAndWeixinUserDTO);
UserWeixinDTO userWeixinDTO = memberAndWeixinUserDTO.getUserWeixinDTO();
String openid = userWeixinDTO.getOpenid();
String unionid = userWeixinDTO.getUnionid();
String appid = userWeixinDTO.getAppid();
UserWeixinDTO _userWeixinDTO = this.userWeixinService.findFirstByAppIdAndOpenId(appid, openid);
log.info("通过appid ==>> {} 和openId ==>> {}，检查微信账号是否存在 ==>> {}",appid, openid, _userWeixinDTO);
// 无账号
if (Objects.isNull(_userWeixinDTO.getId())) {
// 是否存在会员
// 其他账号
UserWeixinDTO userWeixinDTO1 = this.userWeixinService.findFirstByUnionId(unionid);
log.info("账号不存在通过unionid ==>> {}，检查其他微信账号是否存在 ==>> {}",unionid, userWeixinDTO1);
if (Objects.nonNull(userWeixinDTO1.getId())) {
Long memberId = userWeixinDTO1.getMemberId();
if (Objects.nonNull(memberId)) {
userWeixinDTO.setMemberId(memberId);
MemberDTO memberDTO = this.memberService.findById(memberId);
MemberDTO memberDTO1 = memberAndWeixinUserDTO.getMemberDTO();
this.updateMember(memberDTO, memberDTO1);
log.info("其他账号的会员信息 ==>> {}，memberId ==>> {}",memberDTO, memberId);
if (Objects.nonNull(memberDTO.getId())) {
MemberDTO memberDTO1 = memberAndWeixinUserDTO.getMemberDTO();
this.updateMember(memberDTO, memberDTO1);
}
} else {
MemberDTO memberDTO1 = memberAndWeixinUserDTO.getMemberDTO();
log.info("其他账号的无会员信息，创建会员 memberDTO1 ==>> {}",memberDTO1);
String memberCode = memberDTO1.getCode();
if (StringUtils.isNotBlank(memberCode)) {
Member member = new Member();
......@@ -80,10 +106,11 @@ public class UserOperationServiceImpl implements UserOperationService {
}
// 无会员
// 无其他账号
} else {
MemberDTO memberDTO = memberAndWeixinUserDTO.getMemberDTO();
log.info("无其他账号的无会员信息，创建会员 memberDTO ==>> {}",memberDTO);
Member member = new Member();
BeanUtils.copyProperties(memberDTO, member);
member.setId(null);
......@@ -92,19 +119,20 @@ public class UserOperationServiceImpl implements UserOperationService {
}
userWeixinDTO.setId(null);
log.info("保存微信账号，userWeixinDTO ==>> {}",userWeixinDTO);
this.createWeixin(userWeixinDTO);
} else {
// 账号存在，会员也存在
// 会员存在
if(Objects.nonNull(_userWeixinDTO.getMemberId())) {
// 账号存在，修改账号和会员
this.updateWeixin(_userWeixinDTO, userWeixinDTO);
MemberDTO _memberDTO = this.memberService.findById(_userWeixinDTO.getMemberId());
MemberDTO memberDTO = memberAndWeixinUserDTO.getMemberDTO();
this.updateMember(_memberDTO, memberDTO);
if (Objects.nonNull(_memberDTO.getId())){
MemberDTO memberDTO = memberAndWeixinUserDTO.getMemberDTO();
this.updateMember(_memberDTO, memberDTO);
}
// 有账号无会员
} else {
......