人人分销

ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.BooleanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
@@ -91,7 +92,7 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
         }
 
         // 情况二：修改推广员
-        validateCanBindUser(brokerageUser, bindUserId);
+        //validateCanBindUser(brokerageUser, bindUserId);
         brokerageUserMapper.updateById(fillBindUserData(bindUserId, new BrokerageUserDO().setId(id)));
     }
 
@@ -296,27 +297,29 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
     private void validateCanBindUser(BrokerageUserDO user, Long bindUserId) {
         // 校验要绑定的用户有无推广资格
         BrokerageUserDO bindUser = brokerageUserMapper.selectById(bindUserId);
-        if (bindUser == null || BooleanUtil.isFalse(bindUser.getBrokerageEnabled())) {
+        /*if (bindUser == null || BooleanUtil.isFalse(bindUser.getBrokerageEnabled())) {
             throw exception(BROKERAGE_BIND_USER_NOT_ENABLED);
-        }
+        }*/
 
         // 校验绑定自己
-        if (Objects.equals(user.getId(), bindUserId)) {
+     /*   if (Objects.equals(user.getId(), bindUserId)) {
             throw exception(BROKERAGE_BIND_SELF);
+        }*/
+if(ObjectUtil.isNotEmpty(bindUser)){
+    // 下级不能绑定自己的上级
+    for (int i = 0; i <= Short.MAX_VALUE; i++) {
+        if (Objects.equals(bindUser.getBindUserId(), user.getId())) {
+            throw exception(BROKERAGE_BIND_LOOP);
         }
-
-        // 下级不能绑定自己的上级
-        for (int i = 0; i <= Short.MAX_VALUE; i++) {
-            if (Objects.equals(bindUser.getBindUserId(), user.getId())) {
-                throw exception(BROKERAGE_BIND_LOOP);
-            }
-            bindUser = getBrokerageUser(bindUser.getBindUserId());
-            // 找到根节点，结束循环
-            if (bindUser == null || bindUser.getBindUserId() == null) {
-                break;
-            }
+        bindUser = getBrokerageUser(bindUser.getBindUserId());
+        // 找到根节点，结束循环
+        if (bindUser == null || bindUser.getBindUserId() == null) {
+            break;
         }
     }
+}
+
+    }
 
     /**
      * 根据绑定用户编号，获得下级用户编号列表

ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/pom.xml

@@ -85,6 +85,12 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-ip</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-trade-biz</artifactId>
+            <version>2.1.0-jdk8-snapshot</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java

@@ -27,4 +27,9 @@ public class AppAuthWeixinMiniAppLoginReqVO {
     @NotEmpty(message = "state 不能为空")
     private String state;
 
+
+
+    @Schema(description = "bindUserId")
+    private Long bindUserId;
+
 }

ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.member.service.auth;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
@@ -27,6 +28,7 @@ import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum;
 import cn.iocoder.yudao.module.system.enums.oauth2.OAuth2ClientConstants;
 import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum;
 import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -61,6 +63,9 @@ public class MemberAuthServiceImpl implements MemberAuthService {
     @Resource
     private OAuth2TokenApi oauth2TokenApi;
 
+    @Resource
+    private BrokerageUserService brokerageUserService;
+
     @Override
     public AppAuthLoginRespVO login(AppAuthLoginReqVO reqVO) {
         // 使用手机 + 密码，进行登录。
@@ -149,6 +154,13 @@ public class MemberAuthServiceImpl implements MemberAuthService {
         String openid = socialUserApi.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
                 SocialTypeEnum.WECHAT_MINI_APP.getType(), reqVO.getLoginCode(), reqVO.getState()));
 
+      if(  ObjectUtil.isNotEmpty(reqVO.getBindUserId())){
+          brokerageUserService.bindBrokerageUser(user.getId(), reqVO.getBindUserId());
+
+      }else {
+          brokerageUserService.bindBrokerageUser(user.getId(), 0L);
+      }
+        //绑定分销用户
         // 创建 Token 令牌，记录登录日志
         return createTokenAfterLoginSuccess(user, user.getMobile(), LoginLogTypeEnum.LOGIN_SOCIAL, openid);
     }

ruoyi-vue-pro-master/yudao-module-system/yudao-module-system-biz/pom.xml

@@ -127,6 +127,12 @@
             <groupId>com.xingyuv</groupId>
             <artifactId>spring-boot-starter-captcha-plus</artifactId> <!-- 验证码，一般用于登录使用 -->
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-trade-biz</artifactId>
+            <version>2.1.0-jdk8-snapshot</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-vue-pro-master/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java

@@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO;
 import cn.iocoder.yudao.module.system.dal.mysql.social.SocialUserBindMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.social.SocialUserMapper;
 import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum;
+import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageUserService;
 import com.xingyuv.jushauth.model.AuthUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -46,6 +47,8 @@ public class SocialUserServiceImpl implements SocialUserService {
     @Resource
     private SocialClientService socialClientService;
 
+
+
     @Override
     public List<SocialUserDO> getSocialUserList(Long userId, Integer userType) {
         // 获得绑定
@@ -77,6 +80,8 @@ public class SocialUserServiceImpl implements SocialUserService {
                 .userId(reqDTO.getUserId()).userType(reqDTO.getUserType())
                 .socialUserId(socialUser.getId()).socialType(socialUser.getType()).build();
         socialUserBindMapper.insert(socialUserBind);
+      //创建绑定用户
+
         return socialUser.getOpenid();
     }