Merge branch 'feature/mall_product' into test
commit
94bf7664ab
|
@ -107,7 +107,7 @@
|
||||||
a.out_trade_no,
|
a.out_trade_no,
|
||||||
a.pay_time,
|
a.pay_time,
|
||||||
b.nickname,
|
b.nickname,
|
||||||
b.nickname as realName,
|
a.real_name,
|
||||||
a.uid,
|
a.uid,
|
||||||
a.user_phone,
|
a.user_phone,
|
||||||
a.confirm_phone,
|
a.confirm_phone,
|
||||||
|
|
|
@ -89,11 +89,14 @@ public class PromoterServiceImpl implements PromoterService {
|
||||||
promoter.setUserId(memberUserDO.getId());
|
promoter.setUserId(memberUserDO.getId());
|
||||||
promoter.setCreateTime(LocalDateTime.now());
|
promoter.setCreateTime(LocalDateTime.now());
|
||||||
promoterMapper.insert(promoter);
|
promoterMapper.insert(promoter);
|
||||||
|
memberUserDO.setPromoterId(memberUserDO.getId());
|
||||||
|
memberUserService.updateById(memberUserDO);
|
||||||
// 返回
|
// 返回
|
||||||
return promoter.getId();
|
return promoter.getId();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public Long appCreatePromoter(AppPromoterCreateReqVO createReqVO) {
|
public Long appCreatePromoter(AppPromoterCreateReqVO createReqVO) {
|
||||||
//判断手机号是否注册
|
//判断手机号是否注册
|
||||||
MemberUserDO memberUserDO = memberUserService.getUserByMobile(createReqVO.getMobile());
|
MemberUserDO memberUserDO = memberUserService.getUserByMobile(createReqVO.getMobile());
|
||||||
|
@ -127,6 +130,8 @@ public class PromoterServiceImpl implements PromoterService {
|
||||||
promoter.setCreateTime(LocalDateTime.now());
|
promoter.setCreateTime(LocalDateTime.now());
|
||||||
promoter.setSourceType(createReqVO.getSourceType());
|
promoter.setSourceType(createReqVO.getSourceType());
|
||||||
promoterMapper.insert(promoter);
|
promoterMapper.insert(promoter);
|
||||||
|
memberUserDO.setPromoterId(memberUserDO.getId());
|
||||||
|
memberUserService.updateById(memberUserDO);
|
||||||
// 返回
|
// 返回
|
||||||
return promoter.getId();
|
return promoter.getId();
|
||||||
}
|
}
|
||||||
|
@ -278,6 +283,8 @@ public class PromoterServiceImpl implements PromoterService {
|
||||||
}
|
}
|
||||||
promoter.setDeptId(deptRespDTO.getId());
|
promoter.setDeptId(deptRespDTO.getId());
|
||||||
promoterMapper.insert(promoter);
|
promoterMapper.insert(promoter);
|
||||||
|
memberUserDO.setPromoterId(memberUserDO.getId());
|
||||||
|
memberUserService.updateById(memberUserDO);
|
||||||
respVO.getCreateUsernames().add(importUser.getNickName());
|
respVO.getCreateUsernames().add(importUser.getNickName());
|
||||||
return;
|
return;
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue