Merge remote-tracking branch 'origin/master'

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/sharepath/SharePathDO.java

@@ -1,9 +1,6 @@
 package cn.newfeifan.mall.module.distri.dal.dataobject.sharepath;
 
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.newfeifan.mall.framework.mybatis.core.dataobject.BaseDO;
 
@@ -43,5 +40,29 @@ public class SharePathDO extends BaseDO {
      * 顺序
      */
     private Integer sort;
+    /**
+     * 推荐人姓名
+     */
+    private String ancName;
+    /**
+     * 推荐人手机号
+     */
+    private String ancPhone;
+    /**
+     * 直推人姓名
+     */
+    private String descName;
+    /**
+     * 推荐人手机号
+     */
+    private String descPhone;
+    /**
+     * 推荐人昵称
+     */
+    private String ancNickName;
+    /**
+     * 直推人昵称
+     */
+    private String descNickName;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharepath/SharePathServiceImpl.java

@@ -2,20 +2,20 @@ package cn.newfeifan.mall.module.distri.service.sharepath;
 
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.module.distri.service.duser.DuserService;
+import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
+import cn.newfeifan.mall.module.member.service.user.MemberUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
 import cn.newfeifan.mall.module.distri.controller.admin.sharepath.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.sharepath.SharePathDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 
 import cn.newfeifan.mall.module.distri.dal.mysql.sharepath.SharePathMapper;
@@ -38,6 +38,9 @@ public class SharePathServiceImpl implements SharePathService {
     @Resource
     private DuserService duserService;
 
+    @Resource
+    private MemberUserService memberUserService;
+
 
     @Override
     public Long createSharePath(SharePathSaveReqVO createReqVO) {
@@ -61,6 +64,29 @@ public class SharePathServiceImpl implements SharePathService {
         duserService.hasUserAndCreat(createReqVO);
         // 存储他们之间的关系
         sharePathMapper.addNode(createReqVO.getAncestor(), createReqVO.getDescendant());
+
+        //保存用户的基本信息
+        saveSharePathName(createReqVO.getDescendant());
+    }
+
+    private void saveSharePathName(Long descendant){
+        List<SharePathDO> sharePathDOS = sharePathMapper.selectList(new LambdaQueryWrapper<SharePathDO>()
+                .eq(SharePathDO::getDescendant, descendant)
+        );
+
+        for (SharePathDO sharePathDO : sharePathDOS) {
+            MemberUserDO ancestor = memberUserService.getUser(sharePathDO.getAncestor());
+            MemberUserDO descendantUser = memberUserService.getUser(sharePathDO.getDescendant());
+            if (ancestor != null && descendantUser != null) {
+                sharePathDO.setAncName(ancestor.getName());
+                sharePathDO.setAncNickName(ancestor.getNickname());
+                sharePathDO.setAncPhone(ancestor.getMobile());
+                sharePathDO.setDescName(descendantUser.getName());
+                sharePathDO.setDescNickName(descendantUser.getNickname());
+                sharePathDO.setDescPhone(descendantUser.getMobile());
+                sharePathMapper.updateById(sharePathDO);
+            }
+        }
     }
 
 

feifan-server/src/main/resources/application-local.yaml

@@ -9,9 +9,9 @@ spring:
     exclude:
       - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源
 #      - org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration # 默认 local 环境，不开启 Quartz 的自动配置
-      - de.codecentric.boot.admin.server.config.AdminServerAutoConfiguration # 禁用 Spring Boot Admin 的 Server 的自动配置
-      - de.codecentric.boot.admin.server.ui.config.AdminServerUiAutoConfiguration # 禁用 Spring Boot Admin 的 Server UI 的自动配置
-      - de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置
+#      - de.codecentric.boot.admin.server.config.AdminServerAutoConfiguration # 禁用 Spring Boot Admin 的 Server 的自动配置
+#      - de.codecentric.boot.admin.server.ui.config.AdminServerUiAutoConfiguration # 禁用 Spring Boot Admin 的 Server UI 的自动配置
+#      - de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置
   datasource:
     druid: # Druid 【监控】相关的全局配置
       web-stat-filter:
@@ -146,7 +146,7 @@ spring:
     admin:
       # Spring Boot Admin Client 客户端的相关配置
       client:
-        url: http://localhost:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
+        url: http://10.0.5.228:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
         instance:
           service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
       # Spring Boot Admin Server 服务端的相关配置