Merge branch 'zx_index_up' of http://git.dayaedu.com/yonge/mec into master_saas

 Conflicts:

	.idea/httpRequests/http-requests-log.http

.idea/httpRequests/http-requests-log.http

@@ -1,871 +1,620 @@
-GET http://127.0.0.1:9002/extracurricularExercises/queryTeacherServeHomeworkDetail/v2?startTime=2023-06-10&endTime=2023-06-16&type=HOMEWORK&classType=&homeWorkStatus=&page=1&rows=20&musicGroupId=
-Authorization: bearer 72033b9d-e8b7-461f-8dd9-ba35312a351d
-Connection: Keep-Alive
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
+Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
+Proxy-Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-16T142153.200.json
+<> 2023-06-15T221721.200.json
 
 ###
 
-GET http://127.0.0.1:9002/extracurricularExercises/queryTeacherServeHomeworkDetail/v2?startTime=2023-06-10&endTime=2023-06-16&type=HOMEWORK&classType=&homeWorkStatus=&page=1&rows=20&musicGroupId=
-Authorization: bearer 72033b9d-e8b7-461f-8dd9-ba35312a351d
-Connection: Keep-Alive
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
+Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
+Proxy-Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-16T142126.200.json
+<> 2023-06-15T221523.200.json
 
 ###
 
-GET http://127.0.0.1:9002/extracurricularExercises/queryTeacherServeHomeworkDetail/v2?startTime=2023-06-10&endTime=2023-06-16&type=HOMEWORK&classType=&homeWorkStatus=&page=1&rows=20&musicGroupId=
-Authorization: bearer 139a014d-1193-419b-82ff-823d0ad9b154
-Connection: Keep-Alive
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
+Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
+Proxy-Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-16T142059.200.json
+<> 2023-06-15T221236.200.json
 
 ###
 
-GET http://127.0.0.1:9002/extracurricularExercises/queryTeacherServeHomeworkDetail/v2?startTime=2023-04-10&endTime=2023-06-16&type=HOMEWORK&classType=&homeWorkStatus=&page=1&rows=20&musicGroupId=
-Authorization: bearer 139a014d-1193-419b-82ff-823d0ad9b154
-Connection: Keep-Alive
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
+Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
+Proxy-Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-16T133204.200.json
+<> 2023-06-15T220649.200.json
 
 ###
 
-GET http://127.0.0.1:9002/extracurricularExercises/queryTeacherServeHomeworkDetail/v2?startTime=2023-04-10&endTime=2023-06-16&type=HOMEWORK&classType=&homeWorkStatus=&page=1&rows=20&musicGroupId=
-Authorization: bearer 379bbe77-8542-4a58-9453-9a0b20b680fe
-Connection: Keep-Alive
+GET http://127.0.0.1:9002/teacherCourseSchedule/getCourseSchedulesWithDate?date=2023-06-05 00:00:00
+Content-Type: application/json
+Authorization: bearer 4d8e23a1-3acd-42e4-a1ca-b4d595506d98
+Proxy-Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-16T133119.200.json
+<> 2023-06-15T220555.200.json
 
 ###
 
-GET http://127.0.0.1:9002/extracurricularExercises/queryTeacherServeHomeworkDetail/v2?startTime=2023-04-10&endTime=2023-06-16&type=HOMEWORK&classType=&homeWorkStatus=&page=1&rows=20&musicGroupId=
-Authorization: bearer 379bbe77-8542-4a58-9453-9a0b20b680fe
-Connection: Keep-Alive
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
+Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
+Proxy-Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-16T120034.200.json
+<> 2023-06-15T220546.200.json
 
 ###
 
-GET http://127.0.0.1:9002/extracurricularExercises/queryTeacherServeHomeworkDetail/v2?startTime=2023-04-10&endTime=2023-06-16&type=HOMEWORK&classType=&homeWorkStatus=&page=1&rows=20&musicGroupId=
-Authorization: bearer 379bbe77-8542-4a58-9453-9a0b20b680fe
-Connection: Keep-Alive
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
+Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
+Proxy-Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-16T115953.200.json
+<> 2023-06-15T220439.200.json
 
 ###
 
-GET http://127.0.0.1:9002/extracurricularExercises/queryTeacherServeHomeworkDetail/v2?startTime=2023-04-10&endTime=2023-06-16&type=HOMEWORK&classType=&homeWorkStatus=&page=1&rows=20&musicGroupId=
-Authorization: bearer c40a7231-5cfd-4495-ac88-bced0c9aa0cc
-Connection: Keep-Alive
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
+Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
+Proxy-Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-16T115703.200.json
+<> 2023-06-15T220236.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/add
-authorization: bearer 1a9dbd9c-b150-4461-bce9-0f6b082dd708
-Content-Type: application/json
-Content-Length: 2334
-Connection: Keep-Alive
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
+Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
+Proxy-Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{
-  "studentStandardDtos" : [
-    {
-      "qualifiedFlag" : 1,
-      "userId" : "2248984",
-      "repairFlag" : false
-    },
-    {
-      "qualifiedFlag" : 1,
-      "userId" : "2249113",
-      "repairFlag" : false
-    }
-  ],
-  "teacherAttendanceInfo" : {
-    "status" : "1",
-    "signOutLongitudeLatitude" : "114.344874,30.555084",
-    "courseScheduleId" : "2469",
-    "update" : "0",
-    "deviceNum" : "",
-    "signOutRemark" : "好"
-  },
-  "courseHomeworkInfo" : {
-    "lessonExaminationSaveDto" : {
-      "studentLessonExaminationSaveDtos" : [
-        {
-          "group" : "1",
-          "subjectId" : "23",
-          "musicScoreHomeworkDtoList" : [
-            {
-              "musicScoreId" : "1177",
-              "partIndex" : "0"
-            },
-            {
-              "musicScoreId" : "12081",
-              "partIndex" : "0"
-            }
-          ],
-          "musicScoreIdList" : [
-            "1177",
-            "12081"
-          ],
-          "userIdList" : [
-            "2248984"
-          ],
-          "examinationDetailDtos" : [
-            {
-              "musicScoreId" : "1177",
-              "heardLevel" : "ADVANCED",
-              "partIndex" : "0",
-              "score" : 60
-            },
-            {
-              "musicScoreId" : "12081",
-              "heardLevel" : "ADVANCED",
-              "partIndex" : "0",
-              "score" : 70
-            }
-          ]
-        },
-        {
-          "group" : "2",
-          "subjectId" : "23",
-          "musicScoreHomeworkDtoList" : [
-            {
-              "musicScoreId" : "1181",
-              "partIndex" : "0"
-            }
-          ],
-          "musicScoreIdList" : [
-            "1181"
-          ],
-          "userIdList" : [
-            "2249113"
-          ],
-          "examinationDetailDtos" : [
-            {
-              "musicScoreId" : "1181",
-              "heardLevel" : "BEGINNER",
-              "partIndex" : "0",
-              "score" : 60
-            }
-          ]
-        }
-      ],
-      "teacherId" : "2248323",
-      "courseScheduleId" : "2469",
-      "expectNum" : 2,
-      "classGroupId" : "397"
-    },
-    "title" : "",
-    "content" : "",
-    "courseScheduleId" : "2469",
-    "attachments" : "https:\/\/daya.ks3-cn-beijing.ksyuncs.com\/202306\/16\/MTY4Njg4NjAzMjQ1MzQ1NTAwMDAwMA==_2248323classFinishImg.jpeg"
-  }
-}
-
-<> 2023-06-16T113253.200.json
+<> 2023-06-15T215903.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/add
-authorization: bearer cf400ae3-f2b5-40b3-8d7f-7c2d073666ad
-Content-Type: application/json
-Content-Length: 2334
-Connection: Keep-Alive
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
+Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
+Proxy-Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{
-  "studentStandardDtos" : [
-    {
-      "qualifiedFlag" : 1,
-      "userId" : "2248984",
-      "repairFlag" : false
-    },
-    {
-      "qualifiedFlag" : 1,
-      "userId" : "2249113",
-      "repairFlag" : false
-    }
-  ],
-  "teacherAttendanceInfo" : {
-    "status" : "1",
-    "signOutLongitudeLatitude" : "114.344874,30.555084",
-    "courseScheduleId" : "2469",
-    "update" : "0",
-    "deviceNum" : "",
-    "signOutRemark" : "好"
-  },
-  "courseHomeworkInfo" : {
-    "lessonExaminationSaveDto" : {
-      "studentLessonExaminationSaveDtos" : [
-        {
-          "group" : "1",
-          "subjectId" : "23",
-          "musicScoreHomeworkDtoList" : [
-            {
-              "musicScoreId" : "1177",
-              "partIndex" : "0"
-            },
-            {
-              "musicScoreId" : "12081",
-              "partIndex" : "0"
-            }
-          ],
-          "musicScoreIdList" : [
-            "1177",
-            "12081"
-          ],
-          "userIdList" : [
-            "2248984"
-          ],
-          "examinationDetailDtos" : [
-            {
-              "musicScoreId" : "1177",
-              "heardLevel" : "ADVANCED",
-              "partIndex" : "0",
-              "score" : 60
-            },
-            {
-              "musicScoreId" : "12081",
-              "heardLevel" : "ADVANCED",
-              "partIndex" : "0",
-              "score" : 70
-            }
-          ]
-        },
-        {
-          "group" : "2",
-          "subjectId" : "23",
-          "musicScoreHomeworkDtoList" : [
-            {
-              "musicScoreId" : "1181",
-              "partIndex" : "0"
-            }
-          ],
-          "musicScoreIdList" : [
-            "1181"
-          ],
-          "userIdList" : [
-            "2249113"
-          ],
-          "examinationDetailDtos" : [
-            {
-              "musicScoreId" : "1181",
-              "heardLevel" : "BEGINNER",
-              "partIndex" : "0",
-              "score" : 60
-            }
-          ]
-        }
-      ],
-      "teacherId" : "2248323",
-      "courseScheduleId" : "2469",
-      "expectNum" : 2,
-      "classGroupId" : "397"
-    },
-    "title" : "",
-    "content" : "",
-    "courseScheduleId" : "2469",
-    "attachments" : "https:\/\/daya.ks3-cn-beijing.ksyuncs.com\/202306\/16\/MTY4Njg4NjAzMjQ1MzQ1NTAwMDAwMA==_2248323classFinishImg.jpeg"
-  }
-}
-
-<> 2023-06-16T113219.200.json
+<> 2023-06-15T215426.200.json
 
 ###
 
-GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
-Authorization: Bearer 4261d745-d23d-4999-9591-a615fc758e49
-Connection: Keep-Alive
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
+Authorization: bearer e70c68c9-05e3-4502-aed4-f7001a0e2766
+Proxy-Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T213615.200.json
+<> 2023-06-15T215131.200.json
 
 ###
 
-GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
-Authorization: Bearer 4261d745-d23d-4999-9591-a615fc758e49
+POST https://online.lexiaoya.cn/api-backend/open/schoolTeacherStudent/importPlan?fileUrl=https://polestar-oss.oss-cn-shenzhen.aliyuncs.com/assets/excel/0614/0614单簧管导入表.xlsx
+Content-Length: 0
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T213539.200.json
+<> 2023-06-15T100514.200.json
 
 ###
 
-GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
-Authorization: Bearer 4261d745-d23d-4999-9591-a615fc758e49
+POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
+authorization: bearer 0071d90f-5623-4ee9-a88e-c7adb09efb1c
+Content-Type: application/json
+Content-Length: 149
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T213447.200.json
-
-###
-
-GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
-Authorization: Bearer 4261d745-d23d-4999-9591-a615fc758e49
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
+{
+  "page": 1,
+  "rows": 10,
+//  "startTime": "2023-06-06 10:14:57",
+//  "endTime": "2023-06-08 10:14:57",
+//  "search": "",
+  "status": "UNDERWAY"
+}
 
-<> 2023-06-14T213333.200.json
+<> 2023-06-14T173156.200.json
 
 ###
 
-GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
-Authorization: Bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
+authorization: bearer 0071d90f-5623-4ee9-a88e-c7adb09efb1c
+Content-Type: application/json
+Content-Length: 150
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T213013.200.json
-
-###
-
-GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
-Authorization: Bearer b2d082f2-2e51-4880-8119-5471c5287bf9
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
+{
+  "page": 1,
+  "rows": 10,
+//  "startTime": "2023-06-06 10:14:57",
+//  "endTime": "2023-06-08 10:14:57",
+//  "search": "",
+  "status": "NOT_START"
+}
 
-<> 2023-06-14T212934.200.json
+<> 2023-06-14T173111.200.json
 
 ###
 
-GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
-Authorization: Bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
+authorization: bearer a9b023c1-f525-4b95-8723-0ca14b038624
+Content-Type: application/json
+Content-Length: 150
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T212932.200.json
+{
+  "page": 1,
+  "rows": 10,
+//  "startTime": "2023-06-06 10:14:57",
+//  "endTime": "2023-06-08 10:14:57",
+//  "search": "",
+  "status": "NOT_START"
+}
+
+<> 2023-06-14T173045.200.json
 
 ###
 
-GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
-Authorization: Bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=2162
+Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T212928.200.json
+<> 2023-06-14T154028.200.json
 
 ###
 
-GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
-Authorization: Bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=2162
+Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T212634.200.json
+<> 2023-06-14T145629.200.json
 
 ###
 
-GET http://localhost:8002/api/v1/work-order/checkTlpUpdate?workInfoId=1
+GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=1374
+Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T212541.200.json
+<> 2023-06-14T145450.200.json
 
 ###
 
-GET http://localhost:8002/v1/work-order/checkTlpUpdate?workInfoId=1
+GET http://127.0.0.1:8005/courseSchedule/getCurrentCourseDetail/1374
+Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T212528.404.txt
+<> 2023-06-14T143343.200.json
 
 ###
 
-GET http://localhost:8002/work-order/checkTlpUpdate?workInfoId=1
+GET http://127.0.0.1:8005/courseSchedule/query?courseScheduleId=1374
+Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T212513.404.txt
+<> 2023-06-14T143049.200.json
 
 ###
 
-POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
+POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
 authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 87
+Content-Length: 69
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "search": "",
-  "subjectId": 4
+  "courseScheduleId": "2328",
+  "status": "SHARE",
+  "search": ""
 }
 
-<> 2023-06-14T184909.200.json
+<> 2023-06-14T124937.200.json
 
 ###
 
-POST http://127.0.0.1:9002/courseHomework/findHomeworkGroupInfo
+POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
 authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 110
+Content-Length: 69
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "group": 2,
-  "search": "",
-  "page": 1,
-  "rows": 10
+  "courseScheduleId": "2328",
+  "status": "SHARE",
+  "search": ""
 }
 
-<> 2023-06-14T184708.200.json
+<> 2023-06-14T124615.200.json
 
 ###
 
-POST http://127.0.0.1:9002/courseHomework/findHomeworkGroupInfo
+POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
 authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 110
+Content-Length: 69
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "group": 2,
-  "search": "",
-  "page": 1,
-  "rows": 10
+  "courseScheduleId": "2328",
+  "status": "SHARE",
+  "search": ""
 }
 
-<> 2023-06-14T183634.200.json
+<> 2023-06-14T124548.200.json
 
 ###
 
-POST http://127.0.0.1:9002/courseHomework/findHomeworkGroupInfo
+POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
 authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 110
+Content-Length: 69
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "group": 2,
-  "search": "",
-  "page": 1,
-  "rows": 10
+  "courseScheduleId": "2328",
+  "status": "SHARE",
+  "search": ""
 }
 
-<> 2023-06-14T183547.200.json
+<> 2023-06-14T124526.200.json
 
 ###
 
-POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
+POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
 authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 114
+Content-Length: 69
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "search": "",
-  "subjectId": 4,
-  "page": 1,
-  "rows": 10
+  "courseScheduleId": "2328",
+  "status": "SHARE",
+  "search": ""
 }
 
-<> 2023-06-14T175934.200.json
+<> 2023-06-14T124513.200.json
 
 ###
 
-POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
+POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
 authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 116
+Content-Length: 69
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "search": "",
-//  "subjectId": 5,
-  "page": 1,
-  "rows": 10
+  "courseScheduleId": "2328",
+  "status": "SHARE",
+  "search": ""
 }
 
-<> 2023-06-14T175915.200.json
+<> 2023-06-14T124441.200.json
 
 ###
 
-POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
+authorization: bearer a9b023c1-f525-4b95-8723-0ca14b038624
 Content-Type: application/json
-Content-Length: 116
+Content-Length: 152
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "search": "",
-//  "subjectId": 5,
   "page": 1,
-  "rows": 10
+  "rows": 10,
+//  "startTime": "2023-06-06 10:14:57",
+//  "endTime": "2023-06-08 10:14:57",
+//  "search": "",
+//  "status": "NOT_START"
 }
 
-<> 2023-06-14T175818.200.json
+<> 2023-06-14T111123.200.json
 
 ###
 
-POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8005/vipGroupManage/liveStudentList
+Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 114
+Content-Length: 78
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "search": "",
-  "subjectId": 5,
   "page": 1,
-  "rows": 10
+  "rows": 10,
+  "liveGroupId": 102,
+  "search": "测试59611"
 }
 
-<> 2023-06-14T175509.200.json
+<> 2023-06-14T105403.200.json
 
 ###
 
-POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8005/vipGroupManage/liveStudentList
+Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 114
+Content-Length: 77
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "search": "",
-  "subjectId": 5,
   "page": 1,
-  "rows": 10
+  "rows": 10,
+  "liveGroupId": 102,
+  "search": "测试5961"
 }
 
-<> 2023-06-14T175219.200.json
+<> 2023-06-14T105355.200.json
 
 ###
 
-POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://127.0.0.1:8005/vipGroupManage/liveStudentList
+Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
-Content-Length: 114
+Content-Length: 51
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "search": "",
-  "subjectId": 5,
   "page": 1,
-  "rows": 10
+  "rows": 10,
+  "liveGroupId": 102
 }
 
-<> 2023-06-14T175144.200.json
+<> 2023-06-14T105332.200.json
 
 ###
 
-POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
-Content-Type: application/json
-Content-Length: 116
+GET http://127.0.0.1:8005/task/liveCourseRemind
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "search": "",
-//  "subjectId": 4,
-  "page": 1,
-  "rows": 10
-}
-
-<> 2023-06-14T175113.200.json
+<> 2023-06-13T183554.200.json
 
 ###
 
-POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
-Content-Type: application/json
-Content-Length: 114
+GET http://127.0.0.1:8005/task/liveCourseRemind
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "search": "",
-  "subjectId": 4,
-  "page": 1,
-  "rows": 10
-}
-
-<> 2023-06-14T175102.200.json
+<> 2023-06-13T183425.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacher/findCourseStudentsSubjectPublic/v2
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
-Content-Type: application/json
-Content-Length: 96
+GET http://127.0.0.1:8005/task/liveCourseRemind
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "search": "",
-  "page": 1,
-  "rows": 10
-}
-
-<> 2023-06-14T175049.200.json
+<> 2023-06-13T183308.200.json
 
 ###
 
-POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
-Content-Type: application/json
-Content-Length: 114
+GET http://127.0.0.1:8005/task/liveCourseRemind
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "search": "",
-  "subjectId": 5,
-  "page": 1,
-  "rows": 10
-}
-
-<> 2023-06-14T175038.200.json
+<> 2023-06-13T182452.200.json
 
 ###
 
-POST http://127.0.0.1:9002/teacher/findCourseStudentsSubjectPublic/v2
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
-Content-Type: application/json
-Content-Length: 96
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "search": "",
-  "page": 1,
-  "rows": 10
-}
+<> 2023-06-12T163044.200.json
 
-<> 2023-06-14T175013.200.json
+###
+
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-06-12T095605.200.json
 
 ###
 
-POST http://127.0.0.1:9002/courseHomework/findCourseStudentsPublicSubject/v2
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
-Content-Type: application/json
-Content-Length: 96
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{
-  "courseScheduleId": "912",
-  "type": "HOMEWORK",
-  "search": "",
-  "page": 1,
-  "rows": 10
-}
+<> 2023-06-12T095427.200.json
+
+###
+
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T174943.200.json
+<> 2023-06-12T095323.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=2331
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T155016.200.json
+<> 2023-06-12T095238.200.json
 
 ###
 
-GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=912&type=HOMEWORK
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
-Content-Type: application/json
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T154707.200.json
+<> 2023-06-12T095217.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=2162
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T152418.200.json
+<> 2023-06-12T095045.200.json
 
 ###
 
-GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=1374&type=HOMEWORK
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
-Content-Type: application/json
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T141306.200.json
+<> 2023-06-12T094907.200.json
 
 ###
 
-GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=1374&type=HOMEWORK
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
-Content-Type: application/json
+GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
+Authorization: bearer 81d0c352-fcc8-4812-87f5-0f7a68d10451
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T140145.200.json
+<> 2023-06-12T094734.200.json
 
 ###
 
-GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=1374&type=HOMEWORK
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+POST http://localhost:8005/imSendGroupMessage/send
 Content-Type: application/json
+tenantId: 1
+Authorization: bearer 9b756b90-f27a-4ca9-99b1-da854c72eb3f
+Content-Length: 99
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T135932.200.json
+{"postType":"0","messageContent":"3の3","messageType":"TXT","targetIds":"232","isIncludeSender":0}
+
+<> 2023-06-09T174838.200.json
 
 ###
 
-GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=7&type=HOMEWORK
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
-Content-Type: application/json
+GET http://127.0.0.1:8005/task/closeLiveCourseRoom
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T135851.200.json
+<> 2023-06-08T214126.200.json
 
 ###
 
-GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=7&type=HOMEWORK
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
-Content-Type: application/json
+GET http://127.0.0.1:8005/task/closeLiveCourseRoom
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T135813.200.json
+<> 2023-06-08T210807.200.json
 
 ###
 
-GET http://127.0.0.1:9002/courseHomework/findCourseHomeworkDetail?courseScheduleId=7&type=HOMEWORK
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+GET http://127.0.0.1:9002/teacherCourseSchedule/findCourseAttendanceDetailHeadInfo?courseScheduleId=1701
+authorization: bearer b33a3aed-ca44-4537-b3ae-1fba38c2560a
 Content-Type: application/json
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-14T135739.200.json
+<> 2023-06-08T194906.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+GET http://127.0.0.1:9002/teacherCourseSchedule/findCourseAttendanceDetailHeadInfo?courseScheduleId=1701
+authorization: bearer 97fd8e85-bb3c-4967-8a07-47c44957f94a
+Content-Type: application/json
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T163044.200.json
+<> 2023-06-08T194556.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+GET http://127.0.0.1:9002/teacherCourseSchedule/findCourseAttendanceDetailHeadInfo?courseScheduleId=1701
+authorization: bearer 97fd8e85-bb3c-4967-8a07-47c44957f94a
+Content-Type: application/json
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T095605.200.json
+<> 2023-06-08T171149.200.json
 
 ###
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
+GET http://127.0.0.1:8005/task/closeLiveCourseRoom
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-06-12T095427.200.json
+<> 2023-06-08T163756.200.json
 
 ###
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/IndexBaseMonthDataDao.java

@@ -369,13 +369,13 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
     List<IndexBaseMonthData> getTotalAmountDataWithTimelyDetails(@Param("startDate") String startDate,
                                                                  @Param("endDate") String endDate,
                                                                  @Param("organIds") List<Integer> organIds,
-                                                                 @Param("orderType") String orderType,
-                                                                 @Param("notOrderType") List<String> notOrderType,@Param("tenantId") Integer tenantId);
+                                                                 @Param("orderTypeList") List<String> orderTypeList,
+                                                                 @Param("tenantId") Integer tenantId);
     List<IndexBaseMonthData> getOrganTotalAmountDataWithTimelyDetails(@Param("startDate") String startDate,
                                                                  @Param("endDate") String endDate,
                                                                  @Param("organIds") List<Integer> organIds,
-                                                                 @Param("orderType") String orderType,
-                                                                 @Param("notOrderType") List<String> notOrderType,@Param("tenantId") Integer tenantId);
+                                                                 @Param("orderTypeList") List<String> orderTypeList,
+                                                                 @Param("tenantId") Integer tenantId);
 
     List<IndexBaseMonthData> getVipAmountDataWithTimelyDetails(@Param("startDate") String startDate,
                                                                  @Param("endDate") String endDate,

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -2196,6 +2196,9 @@ public class ExportServiceImpl implements ExportService {
                     } else if (row.getGroupType().equals(OrderTypeEnum.REPAIR)) {
                         row.setRepairFee(feeByType.getActualAmount().subtract(feeByType.getMusicalFee()).subtract(feeByType.getTeachingFee()).subtract(feeByType.getOtherFee()));
                     } else if (row.getGroupType() == GroupType.OUTORDER) {
+                        if(row.getType() == RENEW){
+                            row.setMusicGroupCourseFee(row.getActualAmount());
+                        }
                         if (row.getType() != RENEW && row.getType() != APPLY) {
                             //销售收入
                             BigDecimal add = feeByType.getMusicalFee().add(row.getTeachingFee()).add(row.getMaintenanceProductFee()).add(feeByType.getOtherFee());
@@ -3162,7 +3165,7 @@ public class ExportServiceImpl implements ExportService {
         groupTypeConsumerMap.put(GroupType.MUSIC, (orderDto) -> orderDto.setMusicGroupCourseFee(orderDto.getMusicGroupCourseFee().add(orderDto.getActualAmount())));
         groupTypeConsumerMap.put(GroupType.PRACTICE, (orderDto) -> orderDto.setPracticeCourseFee(orderDto.getPracticeCourseFee().add(orderDto.getActualAmount())));
         groupTypeConsumerMap.put(GroupType.REPAIR, (orderDto) -> orderDto.setRepairFee(orderDto.getRepairFee().add(orderDto.getActualAmount())));
-        groupTypeConsumerMap.put(GroupType.OUTORDER, (orderDto) -> orderDto.setOtherFee(orderDto.getOtherFee().add(orderDto.getActualAmount())));
+        groupTypeConsumerMap.put(GroupType.OUTORDER, this::accept);
         groupTypeConsumerMap.put(GroupType.SPORADIC, this::accept);
         if (StringUtils.isEmpty(goodsSellReceiptMerNo)) {
             goodsSellReceiptMerNo = sysConfigDao.findConfigValue("goodsSellReceiptMerNo");
@@ -3379,6 +3382,8 @@ public class ExportServiceImpl implements ExportService {
     private void accept(StudentPaymentOrderExportDto orderDto) {
         if (orderDto.getType() == OrderTypeEnum.DEGREE_REGISTRATION) {
             orderDto.setDegreeFee(orderDto.getDegreeFee().add(orderDto.getActualAmount()));
+        } else if(orderDto.getType() == RENEW){
+            orderDto.setMusicGroupCourseFee(orderDto.getActualAmount());
         } else {
             Consumer<StudentPaymentOrderExportDto> dtoConsumer = chargeTypeConsumerMap.get(orderDto.getChargeType());
             if (dtoConsumer != null) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExtracurricularExercisesReplyServiceImpl.java

@@ -3,24 +3,13 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
-import com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto;
-import com.ym.mec.biz.dal.dto.CourseHomeworkWrapper;
-import com.ym.mec.biz.dal.dto.EduHomeworkCardDto;
-import com.ym.mec.biz.dal.dto.ExtraExerciseStudentsDto;
-import com.ym.mec.biz.dal.dto.SimpleUserDto;
-import com.ym.mec.biz.dal.dto.StudentHomeworkRecordDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
 import com.ym.mec.biz.dal.page.ExtraExercilseReplyQueryInfo;
 import com.ym.mec.biz.dal.page.StudentCourseHomeWorkQueryInfo;
-import com.ym.mec.biz.service.CourseHomeworkService;
-import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
-import com.ym.mec.biz.service.ExtracurricularExercisesService;
-import com.ym.mec.biz.service.MusicGroupService;
-import com.ym.mec.biz.service.StudentServeService;
-import com.ym.mec.biz.service.SysConfigService;
-import com.ym.mec.biz.service.SysMessageService;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
@@ -73,6 +62,9 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
     @Autowired
     private CourseHomeworkService courseHomeworkService;
 
+    @Autowired
+    private StudentLessonTrainingDetailService studentLessonTrainingDetailService;
+
 	@Override
 	public BaseDAO<Long, ExtracurricularExercisesReply> getDAO() {
 		return extracurricularExercisesReplyDao;
@@ -90,6 +82,21 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
             throw new BizException("课外训练不存在");
         }
 
+
+        // 设置乐团声部
+        Map<Integer, StudentSubjectDto> subjectDtoMap= new HashMap<>();
+        if (StringUtils.isNotBlank(extracurricularExercises.getMusicGroupId())) {
+
+            // 学生ID集合
+            Set<Integer> userIdList = extraExerciseStudents.stream()
+                    .map(ExtracurricularExercisesReply::getUserId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+            // 设置声部
+            subjectDtoMap = studentLessonTrainingDetailService
+                    .getStudentMusicGroupSubject(new ArrayList<>(userIdList), extracurricularExercises.getMusicGroupId());
+        }
+
         List<StudentCourseHomework> studentCourseHomeworks=new ArrayList<>();
         for (ExtraExerciseStudentsDto extraExerciseStudent : extraExerciseStudents) {
             StudentCourseHomework studentCourseHomework= JSON.parseObject(JSON.toJSONString(extraExerciseStudent),StudentCourseHomework.class);
@@ -103,8 +110,17 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 			studentCourseHomework.setIsView(extraExerciseStudent.getIsView()==0?YesOrNoEnum.NO:YesOrNoEnum.YES);
 			studentCourseHomework.setAvatar(extraExerciseStudent.getHeadUrl());
             studentCourseHomework.setType(ELessonTrainingType.valueOf(extracurricularExercises.getGroupType()));
-			studentCourseHomeworks.add(studentCourseHomework);
+
+            StudentSubjectDto studentSubjectDto = subjectDtoMap.get(extraExerciseStudent.getUserId());
+            if (studentSubjectDto != null) {
+                studentCourseHomework.setSubjectId(studentSubjectDto.getSubjectId());
+                studentCourseHomework.setSubjectName(studentSubjectDto.getSubjectName());
+            }
+
+            studentCourseHomeworks.add(studentCourseHomework);
 		}
+
+
 		return studentCourseHomeworks;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.google.common.collect.Lists;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
@@ -120,7 +121,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		}
 
 		String startDate1 = startDate.toString() + " 00:00:00";
-		String endDate1 = endDate.toString() + " 23:59:59";;
+		String endDate1 = endDate + " 23:59:59";
 		List<Integer> arrayList = null;
 		if(!CollectionUtils.isEmpty(organIds)){
 			arrayList = new ArrayList<>(organIds);
@@ -386,43 +387,53 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
     //异步处理经营数据查询
 	public void syncOperation(String startDate1,String endDate1,List<Integer> arrayList,Integer tenantId,List<IndexBaseDto> indexBaseDtoList,Map<IndexDataType, List<IndexBaseMonthData>> typeDateMap){
+		List<String> orderTypeList = new ArrayList<>();
+		orderTypeList.add("RENEW");orderTypeList.add("PRACTICE_GROUP_BUY");orderTypeList.add("PRACTICE_GROUP_RENEW");
+		orderTypeList.add("APPLY");orderTypeList.add("ADD_STUDENT");
 		CompletableFuture future1 = this.async(() -> {
-			indexBaseDtoList.add(this.getIndexBaseDto(ORGAN_RENEW_AMOUNT,indexBaseMonthDataDao.getOrganTotalAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,"RENEW",null,tenantId)));
-			indexBaseDtoList.add(this.getIndexBaseDto(ORGAN_VIP_AMOUNT,indexBaseMonthDataDao.getOrganVipAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,tenantId)));
+			List<IndexBaseMonthData> details = indexBaseMonthDataDao.getOrganTotalAmountDataWithTimelyDetails(startDate1, endDate1, arrayList, orderTypeList, tenantId);
+			if(!CollectionUtils.isEmpty(details)){
+				Map<String, List<IndexBaseMonthData>> collect = details.stream().collect(Collectors.groupingBy(e -> e.getOrderType()));
+				indexBaseDtoList.add(this.getIndexBaseDto(ORGAN_RENEW_AMOUNT,collect.getOrDefault("RENEW", Lists.newArrayList())));
+				indexBaseDtoList.add(this.getIndexBaseDto(ORGAN_PRACTICE_AMOUNT,collect.getOrDefault("PRACTICE_GROUP", Lists.newArrayList())));
+				indexBaseDtoList.add(this.getIndexBaseDto(ORGAN_APPLY_AMOUNT,collect.getOrDefault("APPLY", Lists.newArrayList())));
+			}
 		});
-		CompletableFuture future2 = this.async(() -> {
-			indexBaseDtoList.add(this.getIndexBaseDto(ORGAN_PRACTICE_AMOUNT,indexBaseMonthDataDao.getOrganTotalAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,"PRACTICE_GROUP_BUY,PRACTICE_GROUP_RENEW",null,tenantId)));
-			indexBaseDtoList.add(this.getIndexBaseDto(ORGAN_OTHER_AMOUNT,indexBaseMonthDataDao.getOrganOtherAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,tenantId)));
+		CompletableFuture future2 = this.async(()->{
+			List<IndexBaseMonthData> details = indexBaseMonthDataDao.getTotalAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,orderTypeList,tenantId);
+			if(!CollectionUtils.isEmpty(details)){
+				Map<String, List<IndexBaseMonthData>> collect = details.stream().collect(Collectors.groupingBy(e -> e.getOrderType()));
+				typeDateMap.put(RENEW_AMOUNT,collect.getOrDefault("RENEW", Lists.newArrayList()));
+				typeDateMap.put(APPLY_AMOUNT,collect.getOrDefault("PRACTICE_GROUP", Lists.newArrayList()));
+				typeDateMap.put(PRACTICE_AMOUNT,collect.getOrDefault("APPLY", Lists.newArrayList()));
+			}
 		});
 		CompletableFuture future3 = this.async(() -> {
-			indexBaseDtoList.add(this.getIndexBaseDto(IndexDataType.ORGAN_TOTAL_AMOUNT,indexBaseMonthDataDao.getOrganTotalAmountDataWithTimely(startDate1, endDate1, arrayList,tenantId)));
-			indexBaseDtoList.add(this.getIndexBaseDto(ORGAN_APPLY_AMOUNT,indexBaseMonthDataDao.getOrganTotalAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,"APPLY,ADD_STUDENT",null,tenantId)));
+			indexBaseDtoList.add(this.getIndexBaseDto(ORGAN_VIP_AMOUNT,indexBaseMonthDataDao.getOrganVipAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,tenantId)));
 		});
 		CompletableFuture future4 = this.async(() -> {
-			indexBaseDtoList.add(this.getIndexBaseDto(IndexDataType.ORGAN_FINANCE_BALANCE_AMOUNT,indexBaseMonthDataDao.getOrganFinanceBalanceDataWithTimely(startDate1, endDate1, arrayList,tenantId)));
-			indexBaseDtoList.add(this.getIndexBaseDto(ORGAN_FINANCE_AMOUNT,indexBaseMonthDataDao.getOrganFinanceActualDataWithTimely(startDate1, endDate1, arrayList,tenantId)));
+			indexBaseDtoList.add(this.getIndexBaseDto(ORGAN_OTHER_AMOUNT,indexBaseMonthDataDao.getOrganOtherAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,tenantId)));
 		});
-
-		CompletableFuture future5 = this.async(()->{
-			typeDateMap.put(IndexDataType.FINANCE_BALANCE_AMOUNT,indexBaseMonthDataDao.getFinanceBalanceDataWithTimely(startDate1, endDate1, arrayList,tenantId));
-			typeDateMap.put(FINANCE_AMOUNT,indexBaseMonthDataDao.getFinanceActualDataWithTimely(startDate1, endDate1, arrayList,tenantId));
+		CompletableFuture future5 = this.async(() -> {
+			typeDateMap.put(VIP_AMOUNT,indexBaseMonthDataDao.getVipAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,tenantId));
 		});
-		CompletableFuture future6 = this.async(()->{
-			List<IndexBaseMonthData> renewAmount = indexBaseMonthDataDao.getTotalAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,"RENEW",null,tenantId);
-			typeDateMap.put(RENEW_AMOUNT,renewAmount);
-			List<IndexBaseMonthData> vipAmount = indexBaseMonthDataDao.getVipAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,tenantId);
-			typeDateMap.put(VIP_AMOUNT,vipAmount);
+		CompletableFuture future6 = this.async(() -> {
+			typeDateMap.put(OTHER_AMOUNT,indexBaseMonthDataDao.getOtherAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,tenantId));
 		});
 		CompletableFuture future7 = this.async(()->{
-			typeDateMap.put(IndexDataType.TOTAL_AMOUNT,indexBaseMonthDataDao.getTotalAmountDataWithTimely(startDate1, endDate1, arrayList,tenantId));
-			typeDateMap.put(APPLY_AMOUNT,indexBaseMonthDataDao.getTotalAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,"APPLY,ADD_STUDENT",null,tenantId));
+			indexBaseDtoList.add(this.getIndexBaseDto(IndexDataType.ORGAN_FINANCE_BALANCE_AMOUNT,indexBaseMonthDataDao.getOrganFinanceBalanceDataWithTimely(startDate1, endDate1, arrayList,tenantId)));
+			indexBaseDtoList.add(this.getIndexBaseDto(ORGAN_FINANCE_AMOUNT,indexBaseMonthDataDao.getOrganFinanceActualDataWithTimely(startDate1, endDate1, arrayList,tenantId)));
 		});
 		CompletableFuture future8 = this.async(()->{
-			typeDateMap.put(PRACTICE_AMOUNT,indexBaseMonthDataDao.getTotalAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,"PRACTICE_GROUP_BUY,PRACTICE_GROUP_RENEW",null,tenantId));
-			typeDateMap.put(OTHER_AMOUNT,indexBaseMonthDataDao.getOtherAmountDataWithTimelyDetails(startDate1, endDate1, arrayList,tenantId));
+			typeDateMap.put(IndexDataType.FINANCE_BALANCE_AMOUNT,indexBaseMonthDataDao.getFinanceBalanceDataWithTimely(startDate1, endDate1, arrayList,tenantId));
+			indexBaseDtoList.add(this.getIndexBaseDto(IndexDataType.ORGAN_TOTAL_AMOUNT,indexBaseMonthDataDao.getOrganTotalAmountDataWithTimely(startDate1, endDate1, arrayList,tenantId)));
+		});
+		CompletableFuture future9 = this.async(()->{
+			typeDateMap.put(FINANCE_AMOUNT,indexBaseMonthDataDao.getFinanceActualDataWithTimely(startDate1, endDate1, arrayList,tenantId));
+			typeDateMap.put(IndexDataType.TOTAL_AMOUNT,indexBaseMonthDataDao.getTotalAmountDataWithTimely(startDate1, endDate1, arrayList,tenantId));
 		});
 		future1.join();future2.join();future3.join();future4.join();
-		future5.join();future6.join();future7.join();future8.join();
+		future5.join();future6.join();future7.join();future8.join();future9.join();
 	}
 
 	@Override
@@ -502,7 +513,6 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.PART_TIME_NUM)) {
 			saveData(indexBaseMonthDataDao.getTeacherData(dayStr, JobNatureEnum.PART_TIME, null,tenantId), dayStr, IndexDataType.PART_TIME_NUM, tenantId);
 		}
-//		saveData(indexBaseMonthDataDao.getTeacherData(dayStr, null, true), dayStr, IndexDataType.DIMISSION_NUM);
 
 		//剩余课时
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.SURPLUS_COURSE_NUM)) {
@@ -532,17 +542,6 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			saveData(indexBaseMonthDataDao.getGroupSurplusCourseData(dayStr, GroupType.PRACTICE, CourseStatusEnum.OVER,tenantId), dayStr, IndexDataType.OVER_PRACTICE_COURSE_NUM, tenantId);
 		}
 
-		//经营数据
-
-//		List<IndexBaseMonthData> financePayData = indexBaseMonthDataDao.getFinancePayData(dayStr);
-//		List<IndexBaseMonthData> financeBalanceData = indexBaseMonthDataDao.getFinanceBalanceData(dayStr);
-//		List<IndexBaseMonthData> financeActualData = indexBaseMonthDataDao.getFinanceActualData(dayStr);
-//
-//		saveData(financePayData,dayStr,IndexDataType.FINANCE_PAY);
-//		saveData(financeBalanceData,dayStr,IndexDataType.FINANCE_BALANCE_AMOUNT);
-//		saveData(financeActualData,dayStr,IndexDataType.FINANCE_AMOUNT);
-//		saveData(totalAmountData,dayStr,IndexDataType.TOTAL_AMOUNT);
-
 		//业务数据
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.HOMEWORK_CREATE_RATE)) {
 			saveData(indexBaseMonthDataDao.getHomeworkData(dayStr, null,tenantId), monday.toString(), IndexDataType.HOMEWORK_CREATE_RATE, tenantId);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OrderPayOpsServiceImpl.java

@@ -17,6 +17,7 @@ import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import com.huifu.adapay.core.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
@@ -104,6 +105,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         return payment;
     }
 
+
     private void checkSing(PaymentParam param) {
         
         //查询商户支付账户

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentLessonTrainingDetailServiceImpl.java

@@ -286,7 +286,7 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
             for (Map.Entry<Long, List<StudentLessonTrainingDetail>> entry : userMap.entrySet()) {
                 List<StudentLessonTrainingDetail> v1 = entry.getValue();
                 Set<StandardEnum> standardEnumSet = v1.stream().map(o -> o.getTrainingStatus()).filter(Objects::nonNull).collect(Collectors.toSet());
-                if (standardEnumSet.size() > 1) {
+                if (standardEnumSet.size() > 1 || standardEnumSet.contains(StandardEnum.NOT_STANDARD)) {
                     submitNum++;
                 }  else {
                     if (standardEnumSet.contains(StandardEnum.STANDARD)) {

mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

@@ -1496,49 +1496,37 @@
 			   SUM(CASE WHEN spo.actual_amount_ IS NULL THEN 0 ELSE spo.actual_amount_ END +
 		CASE WHEN spo.balance_payment_amount_ IS NULL THEN 0 ELSE spo.balance_payment_amount_ END) activate_num_,
 			   SUM(CASE WHEN spo.actual_amount_ IS NULL THEN 0 ELSE spo.actual_amount_ END +
-		CASE WHEN spo.balance_payment_amount_ IS NULL THEN 0 ELSE spo.balance_payment_amount_ END) percent_,DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') month_
+		CASE WHEN spo.balance_payment_amount_ IS NULL THEN 0 ELSE spo.balance_payment_amount_ END) percent_,DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') month_,
+		CASE WHEN spo.type_ IN ('RENEW') THEN 'RENEW' WHEN spo.type_ IN ('PRACTICE_GROUP_BUY', 'PRACTICE_GROUP_RENEW') THEN 'PRACTICE_GROUP' ELSE 'APPLY' END AS order_type_
 		FROM student_payment_order spo
 		WHERE spo.status_ = 'SUCCESS' AND spo.pay_time_ BETWEEN #{startDate} AND #{endDate} and spo.tenant_id_ = #{tenantId}
-		<if test="orderType != null">
-			AND FIND_IN_SET(spo.type_,#{orderType})
-		</if>
-		<if test="notOrderType != null">
-			AND spo.type_ NOT IN
-			<foreach collection="notOrderType" open="(" close=")" item="item" separator=",">
-				#{item}
-			</foreach>
-		</if>
+		AND spo.type_ IN
+		<foreach collection="orderTypeList" open="(" close=")" item="orderType" separator=",">
+			#{orderType}
+		</foreach>
 		<if test="organIds!=null and organIds.size()>0">
 			AND spo.organ_id_ IN
 			<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
 				#{organId}
 			</foreach>
 		</if>
-		GROUP BY DATE_FORMAT(spo.pay_time_,'%Y-%m-%d')
+		GROUP BY DATE_FORMAT(spo.pay_time_,'%Y-%m-%d'),order_type_
 	</select>
 
 	<select id="getOrganTotalAmountDataWithTimelyDetails" resultMap="IndexBaseMonthData">
 		SELECT SUM(CASE WHEN spo.actual_amount_ IS NULL THEN 0 ELSE spo.actual_amount_ END +
 		CASE WHEN spo.balance_payment_amount_ IS NULL THEN 0 ELSE spo.balance_payment_amount_ END) percent_,
-		    			   o.id_ organ_id_,o.name_ organ_name_
+		    			   o.id_ organ_id_,o.name_ organ_name_,
+		CASE WHEN spo.type_ IN ('RENEW') THEN 'RENEW'
+		WHEN spo.type_ IN ('PRACTICE_GROUP_BUY', 'PRACTICE_GROUP_RENEW') THEN 'PRACTICE_GROUP'
+		ELSE 'APPLY' END AS order_type_
 		FROM organization o
-		LEFT JOIN student_payment_order spo ON o.id_ = spo.organ_id_ AND o.tenant_id_ = spo.tenant_id_
+		LEFT JOIN student_payment_order spo ON o.id_ = spo.organ_id_
 		AND spo.status_ = 'SUCCESS' AND spo.pay_time_ BETWEEN #{startDate} AND #{endDate}
-		<if test="orderType != null">
-			AND FIND_IN_SET(spo.type_,#{orderType})
-		</if>
-		<if test="notOrderType != null">
-			AND spo.type_ NOT IN
-			<foreach collection="notOrderType" open="(" close=")" item="item" separator=",">
-				#{item}
-			</foreach>
-		</if>
-		<if test="organIds!=null and organIds.size()>0">
-			AND spo.organ_id_ IN
-			<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
-				#{organId}
-			</foreach>
-		</if>
+		AND spo.type_ IN
+		<foreach collection="orderTypeList" open="(" close=")" item="orderType" separator=",">
+			#{orderType}
+		</foreach>
 		WHERE o.tenant_id_ = #{tenantId}
 		<if test="organIds!=null and organIds.size()>0">
 			AND o.id_ IN
@@ -1546,7 +1534,7 @@
 				#{organId}
 			</foreach>
 		</if>
-		GROUP BY o.id_ ORDER BY percent_ DESC
+		GROUP BY o.id_,order_type_ ORDER BY percent_ DESC
 	</select>
 
 	<select id="getVipAmountDataWithTimelyDetails" resultMap="IndexBaseMonthData">

mec-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -262,7 +262,7 @@
     <select id="getRegisterSubject" resultMap="com.ym.mec.biz.dal.dao.StudentRegistrationDao.StudentRegistration">
         SELECT sr.user_id_, s.name_ subject_name_,sr.actual_subject_id_ FROM student_registration sr
         LEFT JOIN subject s ON sr.actual_subject_id_=s.id_
-        WHERE sr.music_group_id_=#{musicGroupId} AND s.del_flag_ = 0 AND sr.music_group_status_ != 'QUIT'
+        WHERE sr.music_group_id_=#{musicGroupId} AND s.del_flag_ = 0
         AND sr.user_id_ IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
             #{userId}

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/Payment.java

@@ -6,6 +6,7 @@ import java.util.*;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
+import com.huifu.adapay.core.util.StringUtil;
 import com.huifu.adapay.model.PaymentReverse;
 import com.huifu.adapay.model.Refund;
 import com.ym.mec.thirdparty.adapay.entity.BaseResult;