zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zenghuapei:692263438cac1614459afb35d6de064440fc69a3
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
...
compare: zenghuapei:94bf7664ab43c36ba4e9f1a29e891bee8e0978a4
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

3 Commits
692263438c ... 94bf7664ab

Author SHA1 Message Date
tangqian 94bf7664ab Merge branch 'feature/mall_product' into test 2023-06-16 09:14:37 +08:00
tangqian 538daff555 fix:扫物业码和后台注册推广员的时候 user表的中推广员id默认为自己 2023-06-15 17:43:08 +08:00
tangqian 8d6bfcdcdd fix:修改用于测试跳转金额 2023-06-15 16:20:04 +08:00
2 changed files with 8 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
View File

@ -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,

7
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java
View File

@ -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;
}); });