From 621d95aeff9feb8f4f1d7e2d33a18e5f2aa753c4 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 28 十一月 2023 06:07:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java | 2 ++
cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml | 28 ++++++++++++++++++++++++++++
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 16 ++++++++++++++--
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 6 +++---
4 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index dfc7229..3458faa 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -898,9 +898,9 @@
list3.add(44);
detailsResponse.setRid(list3);
}else {
- ArrayList<Integer> list3 = new ArrayList<>();
- list3.add(43);
- detailsResponse.setRid(list3);
+ ArrayList<Integer> list4 = new ArrayList<>();
+ list4.add(43);
+ detailsResponse.setRid(list4);
}
}
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java b/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
index a8f7b26..1428de3 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
@@ -50,6 +50,8 @@
*/
List<Map<String, Object>> queryRegistrationRecord(Page<Map<String, Object>> page, @Param("coursePackageId") Integer coursePackageId,
@Param("userIds") List<Integer> userIds, @Param("studentIds") List<Integer> studentIds);
+ List<Map<String, Object>> queryRegistrationRecord1(Page<Map<String, Object>> page, @Param("coursePackageId") Integer coursePackageId,
+ @Param("userIds") List<Integer> userIds, @Param("studentIds") List<Integer> studentIds);
/**
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index de2b00e..e91b2dd 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -1189,6 +1189,7 @@
@Override
public List<Map<String, Object>> queryRegistrationRecord(Page<Map<String, Object>> page, QueryRegistrationRecord queryRegistrationRecord) {
Integer coursePackageId = queryRegistrationRecord.getCoursePackageId();
+ TCoursePackage coursePackage = coursePackageService.getById(coursePackageId);
String userName = queryRegistrationRecord.getUserName();
List<Integer> userIds = null;
List<Integer> studentIds = null;
@@ -1205,12 +1206,23 @@
studentIds = students.stream().map(Student::getId).collect(Collectors.toList());
}
}
- List<Map<String, Object>> list = this.baseMapper.queryRegistrationRecord(page, coursePackageId, userIds, studentIds);
+
+ List<Map<String, Object>> list = new ArrayList<>();
+
+ if (coursePackage.getType()==1){
+ list = this.baseMapper.queryRegistrationRecord(page, coursePackageId, userIds, studentIds);}else {
+ list = this.baseMapper.queryRegistrationRecord1(page, coursePackageId, userIds, studentIds);
+ }
for (Map<String, Object> map : list) {
Long id = Long.valueOf(map.get("id").toString());
Integer appUserId = Integer.valueOf(map.get("appUserId").toString());
- Integer studentId = Integer.valueOf(map.get("studentId").toString());
+ Integer studentId = 0;
+ if (coursePackage.getType()==1) {
+ studentId = Integer.valueOf(map.get("studentId").toString());
+ }else {
+ studentId = Integer.valueOf(map.get("studentIds").toString());
+ }
TAppUser appUser = appuClient.queryAppUser1(appUserId);
map.put("userName", null != appUser ? appUser.getName() : "");
diff --git a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
index b8d8fcb..929e249 100644
--- a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
@@ -98,6 +98,34 @@
END, insertTime DESC
</select>
+ <select id="queryRegistrationRecord1" resultType="map">
+ select
+ CAST(id AS CHAR(20)) as id,
+ appUserId,
+ studentIds,
+ DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as insertTime,
+ `status`
+ from t_course_package_order where state = 1
+ <if test="null != coursePackageId">
+ and coursePackageId = #{coursePackageId}
+ </if>
+ <if test="null != userIds">
+ and appUserId in
+ <foreach collection="userIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="null != studentIds">
+ and studentId in
+ <foreach collection="studentIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ order by
+ insertTime DESC
+ </select>
+
+
<select id="queryWalkInStudentList" resultType="map">
select
--
Gitblit v1.7.1