Merge branch 'feature/mall_product' into test

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

@@ -107,7 +107,7 @@
         a.out_trade_no,
         a.pay_time,
         b.nickname,
-        b.nickname as realName,
+        a.real_name,
         a.uid,
         a.user_phone,
         a.confirm_phone,

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

@@ -89,11 +89,14 @@ public class PromoterServiceImpl implements PromoterService {
         promoter.setUserId(memberUserDO.getId());
         promoter.setCreateTime(LocalDateTime.now());
         promoterMapper.insert(promoter);
+        memberUserDO.setPromoterId(memberUserDO.getId());
+        memberUserService.updateById(memberUserDO);
         // 返回
         return promoter.getId();
     }
 
     @Override
+    @Transactional
     public Long appCreatePromoter(AppPromoterCreateReqVO createReqVO) {
         //判断手机号是否注册
         MemberUserDO memberUserDO = memberUserService.getUserByMobile(createReqVO.getMobile());
@@ -127,6 +130,8 @@ public class PromoterServiceImpl implements PromoterService {
         promoter.setCreateTime(LocalDateTime.now());
         promoter.setSourceType(createReqVO.getSourceType());
         promoterMapper.insert(promoter);
+        memberUserDO.setPromoterId(memberUserDO.getId());
+        memberUserService.updateById(memberUserDO);
         // 返回
         return promoter.getId();
     }
@@ -278,6 +283,8 @@ public class PromoterServiceImpl implements PromoterService {
             }
             promoter.setDeptId(deptRespDTO.getId());
             promoterMapper.insert(promoter);
+            memberUserDO.setPromoterId(memberUserDO.getId());
+            memberUserService.updateById(memberUserDO);
             respVO.getCreateUsernames().add(importUser.getNickName());
             return;
         });