Browse Source

1. 扫码邀请得到的人的leaderId和邀请人的leaderId一样
2. 被邀请人在sys_user_jzg_info_salesman表中的数据和被邀请人一致

lipf 3 tháng trước cách đây
mục cha
commit
525b92b97e

+ 1 - 0
commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfo.java

@@ -371,6 +371,7 @@ public class SysUserJzgInfo extends BaseModel implements Serializable {
         this.deptId = yqirInfo.getDeptId();
         this.deptId = yqirInfo.getDeptId();
         this.typeAttr = yqirInfo.getTypeAttr();
         this.typeAttr = yqirInfo.getTypeAttr();
         this.referrerId = yqirInfo.getId();
         this.referrerId = yqirInfo.getId();
+        this.leaderId = yqirInfo.getLeaderId();
     }
     }
 
 
     public SysUserJzgInfo(SysUser sysUser,SysUserJzgInfo inviterInfo) {
     public SysUserJzgInfo(SysUser sysUser,SysUserJzgInfo inviterInfo) {

+ 7 - 9
commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfoSalesman.java

@@ -1,13 +1,13 @@
 package com.jzg.commons.entity.po;
 package com.jzg.commons.entity.po;
 
 
-import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.jzg.commons.core.base.BaseModel;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.io.Serial;
+
 /**
 /**
  * @author quchen
  * @author quchen
  * @date 2025/6/20 10:46
  * @date 2025/6/20 10:46
@@ -15,7 +15,10 @@ import lombok.Data;
 
 
 @Data
 @Data
 @TableName("sys_user_jzg_info_salesman")
 @TableName("sys_user_jzg_info_salesman")
-public class SysUserJzgInfoSalesman {
+public class SysUserJzgInfoSalesman extends BaseModel {
+
+    @Serial
+    private static final long serialVersionUID = 7281876348931805282L;
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
     private String id;
 
 
@@ -25,11 +28,6 @@ public class SysUserJzgInfoSalesman {
 
 
     private int partnerStatus;
     private int partnerStatus;
 
 
-    @ExcelIgnore
-    @Schema(description = "是否删除")
-    @TableLogic
-    private Integer isDelete;
-
     public SysUserJzgInfoSalesman(){
     public SysUserJzgInfoSalesman(){
 
 
     }
     }

+ 1 - 2
partner/src/main/java/com/jzg/controller/DistributionController.java

@@ -23,8 +23,7 @@ public class DistributionController extends BaseController {
             log.info("入参:{}", JSONObject.toJSONString(vo));
             log.info("入参:{}", JSONObject.toJSONString(vo));
             DistributionUtils.newSaveFeeInfo(vo.getInsOrders(), vo.getOrdersCosts(), vo.getLicenseNo());
             DistributionUtils.newSaveFeeInfo(vo.getInsOrders(), vo.getOrdersCosts(), vo.getLicenseNo());
         } catch (Exception e) {
         } catch (Exception e) {
-            e.printStackTrace();
-            log.error("合伙人分销明细数据生成失败:{}", e.getMessage());
+            log.error("合伙人分销明细数据生成失败:{}", e.getMessage(),e);
         }
         }
         return HttpResult.ok();
         return HttpResult.ok();
     }
     }

+ 1 - 0
partner/src/main/java/com/jzg/utils/DistributionUtils.java

@@ -68,6 +68,7 @@ public class DistributionUtils {
         SysUserJzgInfo userInfoById = organizationClient.getPartUserInfoByMobile(insOrders.getRealQuoteUserId());
         SysUserJzgInfo userInfoById = organizationClient.getPartUserInfoByMobile(insOrders.getRealQuoteUserId());
         if (Objects.isNull(userInfoById)){
         if (Objects.isNull(userInfoById)){
             log.info("当前出单员不是合伙人用户:{}",insOrders.getRealQuoteUserId());
             log.info("当前出单员不是合伙人用户:{}",insOrders.getRealQuoteUserId());
+            return;
         }
         }
         String userId = userInfoById.getId();
         String userId = userInfoById.getId();
         String userId3 = CalculateCommissionUtils.querySuperiorAndSubordinate(userId, GRADE_3);
         String userId3 = CalculateCommissionUtils.querySuperiorAndSubordinate(userId, GRADE_3);

+ 18 - 6
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgAppServiceImpl.java

@@ -229,11 +229,12 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
             LambdaQueryWrapper<SysUserJzgInfo> infoWrapper = new LambdaQueryWrapper<>();
             LambdaQueryWrapper<SysUserJzgInfo> infoWrapper = new LambdaQueryWrapper<>();
             infoWrapper.eq(SysUserJzgInfo::getUserId, yqrAppUser.getUserId());
             infoWrapper.eq(SysUserJzgInfo::getUserId, yqrAppUser.getUserId());
             infoWrapper.eq(SysUserJzgInfo::getSystemCode, param.getSystemCode());
             infoWrapper.eq(SysUserJzgInfo::getSystemCode, param.getSystemCode());
-            SysUserJzgInfo yqirInfo = sysUserJzgInfoService.getOne(infoWrapper);
-            if (Objects.isNull(yqirInfo)) {
+            SysUserJzgInfo yqrInfo = sysUserJzgInfoService.getOne(infoWrapper);
+            if (Objects.isNull(yqrInfo)) {
                 throw new SystemException("邀请人数据异常!");
                 throw new SystemException("邀请人数据异常!");
             }
             }
-            SysDept dept = sysDeptMapper.selectById(yqirInfo.getDeptId());
+            SysDept dept = sysDeptMapper.selectById(yqrInfo.getDeptId());
+            String leaderId = yqrInfo.getLeaderId();
             AssertionUtils.isFail(Objects.isNull(dept), "邀请人所在部门不存在");
             AssertionUtils.isFail(Objects.isNull(dept), "邀请人所在部门不存在");
             invitationVo.setDeptName(dept.getName());
             invitationVo.setDeptName(dept.getName());
             invitationVo.setMobile(param.getMobile());
             invitationVo.setMobile(param.getMobile());
@@ -256,11 +257,12 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
                 sysUserJzgApp.setDeptId(yqrAppUser.getDeptId());
                 sysUserJzgApp.setDeptId(yqrAppUser.getDeptId());
                 sysUserJzgApp.setSystemCode(systemCode);
                 sysUserJzgApp.setSystemCode(systemCode);
                 sysUserJzgApp.setReferrerId(yqrAppUser.getId());
                 sysUserJzgApp.setReferrerId(yqrAppUser.getId());
+                sysUserJzgApp.setLeaderId(leaderId);
                 sysUserJzgAppMapper.insert(sysUserJzgApp);
                 sysUserJzgAppMapper.insert(sysUserJzgApp);
 
 
                 // 增加推荐人关系
                 // 增加推荐人关系
                 this.addRelationPerson(yqrAppUser, sysUserJzgApp);
                 this.addRelationPerson(yqrAppUser, sysUserJzgApp);
-                SysUserJzgInfo userInfo = new SysUserJzgInfo(yqirInfo, sysUser);
+                SysUserJzgInfo userInfo = new SysUserJzgInfo(yqrInfo, sysUser);
                 sysUserJzgInfoService.save(userInfo);
                 sysUserJzgInfoService.save(userInfo);
                 userId = userInfo.getId();
                 userId = userInfo.getId();
                 invitationVo.setIsJoined(0);
                 invitationVo.setIsJoined(0);
@@ -280,7 +282,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
                     sysUserJzgAppMapper.insert(sysUserJzgApp);
                     sysUserJzgAppMapper.insert(sysUserJzgApp);
                     // 增加推荐人关系
                     // 增加推荐人关系
                     this.addRelationPerson(yqrAppUser, sysUserJzgApp);
                     this.addRelationPerson(yqrAppUser, sysUserJzgApp);
-                    SysUserJzgInfo userInfo = new SysUserJzgInfo(yqirInfo, user);
+                    SysUserJzgInfo userInfo = new SysUserJzgInfo(yqrInfo, user);
                     sysUserJzgInfoService.save(userInfo);
                     sysUserJzgInfoService.save(userInfo);
                     userId = userInfo.getId();
                     userId = userInfo.getId();
                     log.info("被邀请人在sys_user_jzg_app表中的序号是[{}]",userId);
                     log.info("被邀请人在sys_user_jzg_app表中的序号是[{}]",userId);
@@ -294,7 +296,17 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
                 }
                 }
                 sysUserId = user.getId();
                 sysUserId = user.getId();
             }
             }
-            teamInvitation(yqirInfo, param, userId, sysUserId);
+            // add by lipf 2026年6月9日15:16:39 向 sys_user_jzg_info_salesman 表中插入一条记录 
+            SysUserJzgInfoSalesman salesman = new SysUserJzgInfoSalesman();
+            salesman.setSysUserJzgInfoId(userId);
+            salesman.setTypeAttr("6");
+            salesman.setIsDelete(0);
+            salesman.setCreateBy("sys");
+            salesman.setCreateTime(LocalDateTime.now());
+            salesman.setUpdateBy("sys");
+            salesman.setUpdateTime(LocalDateTime.now());
+            sysUserJzgInfoSalesmanService.save(salesman);
+            this.teamInvitation(yqrInfo, param, userId, sysUserId);
             return invitationVo;
             return invitationVo;
         } catch (Exception e) {
         } catch (Exception e) {
             log.error("invitationRegister",e);
             log.error("invitationRegister",e);