From 79bdd61d35e659f74c9ff50ebc0876f7b3b5f41f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Wed, 9 Apr 2025 16:01:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/DlDriveSchoolStudentController.java | 15 +++++++
 .../base/entity/DlDriveSchoolStudent.java     |  4 ++
 .../service/DlDriveSchoolStudentService.java  |  8 ++++
 .../impl/DlDriveSchoolStudentServiceImpl.java | 44 ++++++++++++++++---
 4 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java
index f0e5173d..3a2ab82c 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java
@@ -189,5 +189,20 @@ public class DlDriveSchoolStudentController {
         return success(schoolStudentService.indexGetFormList(startTimeStr,endTimeStr));
     }
 
+    /**
+     * 获取学员详细信息
+     *
+     * @param uniqueCode 学员id
+     * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<cn.iocoder.yudao.module.base.vo.DlDriveSchoolStudentVO>
+     * @author PQZ
+     * @date 9:58 2025/2/10
+     **/
+    @GetMapping("/getByUniqueCode")
+    @Operation(summary = "获得驾校学员")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<DlDriveSchoolStudentVO> getDlDriveSchoolStudentByUniqueCode(@RequestParam("uniqueCode") String uniqueCode) {
+        return success(schoolStudentService.queryStudentByUniqueCode(uniqueCode));
+    }
+
     
 }
\ No newline at end of file
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolStudent.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolStudent.java
index 79673270..ddd8d0aa 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolStudent.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolStudent.java
@@ -101,5 +101,9 @@ public class DlDriveSchoolStudent extends TenantBaseDO {
      * 毕业时间
      */
     private String gradTime;
+    /**
+     * 唯一码
+     */
+    private String uniqueCode;
 
 }
\ No newline at end of file
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolStudentService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolStudentService.java
index 7414b1f2..2cb88619 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolStudentService.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/DlDriveSchoolStudentService.java
@@ -152,4 +152,12 @@ public interface DlDriveSchoolStudentService extends IService<DlDriveSchoolStude
      * @param tenantId 租户id
      */
     Boolean updateStudentPassAndGradTime(Date passTime, Long userId, String courseId, Long tenantId);
+
+    /**
+     * 根据唯一码查询学员信息
+     *
+     * @param uniqueCode 唯一码
+     * @return cn.iocoder.yudao.module.base.vo.DlDriveSchoolStaffVO
+     */
+    DlDriveSchoolStudentVO queryStudentByUniqueCode(String uniqueCode);
 }
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolStudentServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolStudentServiceImpl.java
index 9d8c6a46..29976e70 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolStudentServiceImpl.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolStudentServiceImpl.java
@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.base.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
@@ -16,6 +18,7 @@ import cn.iocoder.yudao.module.base.vo.StudentCountVO;
 import cn.iocoder.yudao.module.course.entity.SchoolCourseOrder;
 import cn.iocoder.yudao.module.course.service.ProcessService;
 import cn.iocoder.yudao.module.course.service.SchoolCourseOrderService;
+import cn.iocoder.yudao.module.staff.service.UniqueCodeService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -52,12 +55,18 @@ public class DlDriveSchoolStudentServiceImpl extends ServiceImpl<DlDriveSchoolSt
     @Resource
     private SchoolNotifyMessageSendService schoolNotifyMessageSendService;
 
+    @Resource
+    private UniqueCodeService uniqueCodeService;
+
     @Override
     public String createDlDriveSchoolStudent(DlDriveSchoolStudentVO createReqVO) {
         // 插入
         DlDriveSchoolStudent dlDriveSchoolStudent = BeanUtils.toBean(createReqVO, DlDriveSchoolStudent.class);
         DlDriveSchoolStudent studentByIdCard = this.getStudentByIdCard(dlDriveSchoolStudent.getIdCard());
         if (studentByIdCard == null) {
+            // 生成唯一推广码
+            String uniqueCode = uniqueCodeService.createUniqueCode();
+            dlDriveSchoolStudent.setUniqueCode(uniqueCode);
             dlDriveSchoolStudentMapper.insert(dlDriveSchoolStudent);
             return dlDriveSchoolStudent.getId();
         }
@@ -121,11 +130,24 @@ public class DlDriveSchoolStudentServiceImpl extends ServiceImpl<DlDriveSchoolSt
      **/
     @Override
     public DlDriveSchoolStudent getStudentByUserId(Long userId) {
-        LambdaQueryWrapper<DlDriveSchoolStudent> queryWrapper = new LambdaQueryWrapper<DlDriveSchoolStudent>()
+        DlDriveSchoolStudent student = getOne(Wrappers.<DlDriveSchoolStudent>lambdaQuery()
                 .eq(DlDriveSchoolStudent::getUserId, userId)
-                .orderByDesc(BaseDO::getCreateTime);
-        List<DlDriveSchoolStudent> list = this.list(queryWrapper);
-        return list.isEmpty() ? null : list.get(0);
+                .orderByDesc(DlDriveSchoolStudent::getCreateTime)
+                .last("limit 1"));
+
+        // 如果没有找到，则返回null
+        if (ObjectUtil.isEmpty(student)) {
+            return null;
+        } else {
+            // 判断是否有唯一码
+            if (StringUtils.isBlank(student.getUniqueCode())) {
+                // 生成唯一推广码
+                String uniqueCode = uniqueCodeService.createUniqueCode();
+                student.setUniqueCode(uniqueCode);
+                dlDriveSchoolStudentMapper.updateById(student);
+            }
+            return student;
+        }
     }
 
     /**
@@ -256,7 +278,7 @@ public class DlDriveSchoolStudentServiceImpl extends ServiceImpl<DlDriveSchoolSt
     @TenantIgnore
     @Override
     @Transactional
-    public Boolean updateStudentPassAndGradTime(Date passTime, Long userId,String courseId, Long tenantId) {
+    public Boolean updateStudentPassAndGradTime(Date passTime, Long userId, String courseId, Long tenantId) {
         if (ObjectUtils.isEmpty(passTime) || ObjectUtils.isEmpty(userId) || ObjectUtils.isEmpty(tenantId)) {
             return false;
         }
@@ -276,5 +298,17 @@ public class DlDriveSchoolStudentServiceImpl extends ServiceImpl<DlDriveSchoolSt
         return true;
     }
 
+    /**
+     * 根据唯一码查询学员信息
+     *
+     * @param uniqueCode 唯一码
+     * @return cn.iocoder.yudao.module.base.vo.DlDriveSchoolStaffVO
+     */
+    @Override
+    public DlDriveSchoolStudentVO queryStudentByUniqueCode(String uniqueCode) {
+        return BeanUtil.copyProperties(getOne(Wrappers.<DlDriveSchoolStudent>lambdaQuery().eq(DlDriveSchoolStudent::getUniqueCode, uniqueCode)),
+                DlDriveSchoolStudentVO.class);
+    }
+
 
 }