From 438c044128b276b9df53e9332e8bf3d76ff6f2dc Mon Sep 17 00:00:00 2001
From: limqhz <lmq540344226@163.com>
Date: Wed, 15 Feb 2023 14:33:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=87=8D=E5=A4=8D=E9=A2=84?=
 =?UTF-8?q?=E8=AE=A2=E6=8F=90=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 other/libs/maven_install                        |  2 ++
 .../com/sv/mapper/MemberLessonTicketMapper.java |  5 +++++
 .../service/api/MemberLessonTicketService.java  |  4 ++++
 .../mapper/sv/MemberLessonTicketMapper.xml      | 17 +++++++++++++++--
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 other/libs/maven_install

diff --git a/other/libs/maven_install b/other/libs/maven_install
new file mode 100644
index 0000000..cae3898
--- /dev/null
+++ b/other/libs/maven_install
@@ -0,0 +1,2 @@
+mvn install:install-file "-Dfile=framework-core-2.1.5.jar" "-DgroupId=com.ydd.framwork.core" "-DartifactId=framework-core" "-Dversion=2.1.5" "-Dpackaging=jar"
+mvn install:install-file "-Dfile=wechat-base-1.0.47-RELEASE.jar" "-DgroupId=com.dw.ccm.wechat.base" "-DartifactId=wechat-base" "-Dversion=1.0.47-RELEASE" "-Dpackaging=jar"
diff --git a/service/src/main/java/com/sv/mapper/MemberLessonTicketMapper.java b/service/src/main/java/com/sv/mapper/MemberLessonTicketMapper.java
index 1f55959..95b20a6 100644
--- a/service/src/main/java/com/sv/mapper/MemberLessonTicketMapper.java
+++ b/service/src/main/java/com/sv/mapper/MemberLessonTicketMapper.java
@@ -150,6 +150,11 @@ public interface MemberLessonTicketMapper {
      */
     void updateMemberStatus(@Param("id") Integer id);
 
+    /**
+     * 判断，用户是否购买过课程价格为0的
+     */
+    Integer findByNoPay(@Param("memberId") Integer memberId,@Param("lessonId") Integer lessonId);
+
     /**
      * 判断，用户是否购买过课程价格为0的
      */
diff --git a/service/src/main/java/com/sv/service/api/MemberLessonTicketService.java b/service/src/main/java/com/sv/service/api/MemberLessonTicketService.java
index 35a12e7..19cf9b1 100644
--- a/service/src/main/java/com/sv/service/api/MemberLessonTicketService.java
+++ b/service/src/main/java/com/sv/service/api/MemberLessonTicketService.java
@@ -215,6 +215,10 @@ public class MemberLessonTicketService extends BaseServiceImpl {
         venueLessonService.decide(venueLesson, lessonTicketOrderDTO.getNum());
         Integer countByZero = memberLessonTicketMapper.findByZero(memberId, lessonTicketOrderDTO.getLessonId());
         if (countByZero != 0) {
+            Integer contNoPay = memberLessonTicketMapper.findByNoPay(memberId, lessonTicketOrderDTO.getLessonId());
+            if (contNoPay != 0) {
+                throw new ServiceException("您两分钟内已预订过该课程，请稍候再试");
+            }
             throw new ServiceException("不可重复预约相同课程");
         }
         // 判断是否预约过，价格为0的课程
diff --git a/service/src/main/resources/mybatis/mapper/sv/MemberLessonTicketMapper.xml b/service/src/main/resources/mybatis/mapper/sv/MemberLessonTicketMapper.xml
index b18c46f..425901b 100644
--- a/service/src/main/resources/mybatis/mapper/sv/MemberLessonTicketMapper.xml
+++ b/service/src/main/resources/mybatis/mapper/sv/MemberLessonTicketMapper.xml
@@ -729,7 +729,7 @@
 	</update>
 
     <!-- 判断，用户是否购买过课程价格为0的 -->
-    <select id="findByZero" resultType="java.lang.Integer">
+    <select id="findByNoPay" resultType="java.lang.Integer">
 		SELECT
 			COUNT(0)
 		FROM
@@ -738,11 +738,24 @@
 			member_id = #{memberId}
 		AND lesson_id = #{lessonId}
 		AND `status` != 2
+        AND pay_status = 0
 	</select>
 
+    <!-- 判断，用户是否购买过课程价格为0的 -->
+    <select id="findByZero" resultType="java.lang.Integer">
+        SELECT
+        COUNT(0)
+        FROM
+        sv_member_lesson_ticket
+        WHERE
+        member_id = #{memberId}
+        AND lesson_id = #{lessonId}
+        AND `status` != 2
+    </select>
+
     <select id="findTicketByStatusAndTime" resultMap="MemberLessonTicketDetailDtoMap">
 		SELECT * from sv_member_lesson_ticket
 		WHERE deleted = 0 and member_id = #{memberId}
 		and status = #{status} and <![CDATA[created_time <= #{endDate}]]> and created_time >= #{startDate}
 	</select>
-</mapper>
\ No newline at end of file
+</mapper>