From 1d53a4c56cc9aecbce7278bb8516f23f50823027 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 四月 2025 14:23:38 +0800
Subject: [PATCH] 惠民卡代码

---
 cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
index 4b712b6..86a9955 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -16,9 +16,7 @@
 import com.dsh.account.util.ResultUtil;
 import com.dsh.account.util.TokenUtil;
 import com.dsh.account.util.ToolUtil;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -58,7 +56,17 @@
     @Resource
     private CoursePackageClient coursePackageClient;
 
-
+    /**
+     * 查询惠民卡绑定学员列表信息
+     *
+     * @return
+     */
+    @RequestMapping("/base/student/getStudentByIds/{ids}")
+    public List<TStudent> getStudentByIds(@PathVariable("ids") String ids) {
+        List<TStudent> list = studentService.list(new LambdaQueryWrapper<TStudent>()
+                .in(TStudent::getId, Arrays.asList(ids.split(","))));
+        return list;
+    }
 
     /**
      * 添加学员
@@ -115,8 +123,8 @@
     }
 
 
-    @ResponseBody
     @PostMapping("/student/queryStudentCom")
+
     public List<Map<String, Object>> queryStudentCom(@RequestBody Integer id) {
 
         List<Map<String, Object>> list = studentService.queryCom(id);
@@ -1088,6 +1096,7 @@
         HashMap<String, Object> map = new HashMap<>();
         List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1)
                         .isNotNull(TAppUser::getPhone)
+                .ne(TAppUser::getState,3)
                 .isNotNull(TAppUser::getCity));
         Set<String> strings2 = new HashSet<>(list.stream().filter(e -> e.getCity().equals("[]")).collect(Collectors.groupingBy(TAppUser::getProvince)).keySet());
         List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList());
@@ -1169,6 +1178,7 @@
         HashMap<String, Object> map = new HashMap<>();
         List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids)
                 .isNotNull(TAppUser::getPhone)
+                .ne(TAppUser::getState,3)
                 .isNotNull(TAppUser::getCity));
         Set<String> strings2 = new HashSet<>(list.stream().filter(e -> e.getCity().equals("[]")).collect(Collectors.groupingBy(TAppUser::getProvince)).keySet());
         List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList());
@@ -1251,6 +1261,7 @@
         HashMap<String, Object> map = new HashMap<>();
         List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids)
                 .isNotNull(TAppUser::getPhone)
+                .ne(TAppUser::getState,3)
                 .isNotNull(TAppUser::getCity));
         List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList());
         if (collect.size() == 0) {

--
Gitblit v1.7.1