From 06dc40189efbf8464fe8d629c32b95fe02a76240 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Wed, 22 Oct 2025 16:40:21 +0800
Subject: [PATCH] 邀请新用户记录添加

---
 oying-system/src/main/java/com/oying/modules/system/domain/Invitations.java                  |    2 +-
 oying-system/src/main/java/com/oying/modules/system/domain/dto/InvitationsVo.java            |    6 +++---
 oying-system/src/main/java/com/oying/modules/system/service/impl/InvitationsServiceImpl.java |   14 ++++++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/Invitations.java b/oying-system/src/main/java/com/oying/modules/system/domain/Invitations.java
index 6578abe..3b4ce2b 100644
--- a/oying-system/src/main/java/com/oying/modules/system/domain/Invitations.java
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/Invitations.java
@@ -53,7 +53,7 @@
     @ApiModelProperty(value = "记录类型(邀请新用户 YQ)")
     private String type;
 
-    @ApiModelProperty(value = "用户类型(QS骑手邀请记录,YH买家用户邀请记录,MJ卖家)")
+    @ApiModelProperty(value = "用户类型(QS骑手邀请记录,YH买家用户邀请记录,MJ卖家邀请卖家,MJQS卖家邀请骑手,MJYH卖家邀请买家)")
     private String userType;
 
     @ApiModelProperty(value = "1成功 0提交 2失败")
diff --git a/oying-system/src/main/java/com/oying/modules/system/domain/dto/InvitationsVo.java b/oying-system/src/main/java/com/oying/modules/system/domain/dto/InvitationsVo.java
index f653846..94b632c 100644
--- a/oying-system/src/main/java/com/oying/modules/system/domain/dto/InvitationsVo.java
+++ b/oying-system/src/main/java/com/oying/modules/system/domain/dto/InvitationsVo.java
@@ -1,6 +1,7 @@
 package com.oying.modules.system.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,8 +12,7 @@
 * @author pxb
 * @date 2025-10-20
 **/
-@Getter
-@Setter
+@Data
 public class InvitationsVo implements Serializable {
 
     @ApiModelProperty(value = "邀请人ID")
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "新用户ID")
     private Long newUserId;
 
-    @ApiModelProperty(value = "用户类型(QS骑手邀请记录,YH买家用户邀请记录)")
+    @ApiModelProperty(value = "用户类型(QS骑手邀请记录,YH买家用户邀请记录,MJ卖家邀请卖家,MJQS卖家邀请骑手,MJYH卖家邀请买家)")
     private String userType;
 
 }
diff --git a/oying-system/src/main/java/com/oying/modules/system/service/impl/InvitationsServiceImpl.java b/oying-system/src/main/java/com/oying/modules/system/service/impl/InvitationsServiceImpl.java
index 65dee21..865fe2d 100644
--- a/oying-system/src/main/java/com/oying/modules/system/service/impl/InvitationsServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/system/service/impl/InvitationsServiceImpl.java
@@ -1,10 +1,12 @@
 package com.oying.modules.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.oying.modules.system.domain.Invitations;
 import com.oying.modules.system.domain.User;
 import com.oying.modules.system.domain.dto.InvitationsVo;
 import com.oying.modules.system.mapper.UserMapper;
 import com.oying.utils.FileUtil;
+import com.oying.utils.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -95,7 +97,15 @@
 
     @Override
     public Object addInvitations(InvitationsVo invitationsVo) {
+        // SecurityUtils.getCurrentUserId();
         // 判断是否为新用户
+        if(userMapper.selectById(invitationsVo.getNewUserId()) == null) {
+            throw new RuntimeException("用户不存在");
+        }
+        Invitations selectOne = invitationsMapper.selectOne(new QueryWrapper<Invitations>().eq("new_user_id", invitationsVo.getNewUserId()));
+        if(selectOne != null) {
+            throw new RuntimeException("用户已被邀请过!");
+        }
         // 查询邀请人信息
         User user = userMapper.selectById(invitationsVo.getInviterId());
         Invitations invitations = new Invitations();
@@ -103,13 +113,13 @@
         invitations.setInviterPhone(user.getUsername());
         invitations.setInviterName(user.getNickName());
         invitations.setInviterOpenId(user.getOpenid());
-        if(invitationsVo.getUserType().equals("QS")) {
+        if(invitationsVo.getUserType().equals("QS") || invitationsVo.getUserType().equals("MJQS")) {
             invitations.setInviterOpenId(user.getRiderOpenId());
         }
         // 查询被邀请人的信息
         User newUser = userMapper.selectById(invitationsVo.getNewUserId());
         invitations.setNewUserOpenId(newUser.getOpenid());
-        if(invitationsVo.getUserType().equals("QS")) {
+        if(invitationsVo.getUserType().equals("QS") || invitationsVo.getUserType().equals("MJQS")) {
             invitations.setNewUserOpenId(newUser.getRiderOpenId());
         }
         invitations.setNewUserId(invitationsVo.getNewUserId());

--
Gitblit v1.9.3