From ebbd658ffb01172878c80a5cc90044eea16fe1c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 24 Dec 2024 14:49:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=86=E6=89=B9=E6=AC=A110=E9=9B=86?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/orders/service/impl/OrdersServiceImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index 53e19d27..67a4c5cf 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -37,7 +37,6 @@ import com.sqx.modules.orders.service.OrdersService; import com.sqx.modules.pay.controller.app.AliPayController; import com.sqx.modules.pay.service.DyService; import com.sqx.modules.pay.service.WxService; -import com.sqx.modules.sdk.entity.SdkInfo; import com.sqx.modules.utils.AliPayOrderUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -109,11 +108,7 @@ public class OrdersServiceImpl extends ServiceImpl implements //设置短剧id courseUser.setCourseId(orders.getCourseId()); courseUser.setCourseDetailsId(orders.getCourseDetailsId()); - if (courseUser.getCourseDetailsId() != null) { - courseUser.setClassify(2); - } else { - courseUser.setClassify(1); - } + courseUser.setClassify(2); //设置用户id courseUser.setUserId(orders.getUserId()); //设置订单id From 4629ec88113e3b03aeafc07bbbde98da08ee3662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 24 Dec 2024 14:57:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=86=E6=89=B9=E6=AC=A110=E9=9B=86?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/orders/service/impl/OrdersServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index 67a4c5cf..5b7ef1e1 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -107,7 +107,7 @@ public class OrdersServiceImpl extends ServiceImpl implements CourseUser courseUser = new CourseUser(); //设置短剧id courseUser.setCourseId(orders.getCourseId()); - courseUser.setCourseDetailsId(orders.getCourseDetailsId()); + courseUser.setCourseDetailsId(courseDetailsId); courseUser.setClassify(2); //设置用户id courseUser.setUserId(orders.getUserId()); From 8872b6e51349d18350954e6aa6f73d9968591e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 24 Dec 2024 15:13:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=86=E6=89=B9=E6=AC=A110=E9=9B=86?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/orders/service/impl/OrdersServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index 5b7ef1e1..13f8d9be 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -374,7 +374,12 @@ public class OrdersServiceImpl extends ServiceImpl implements if (isBuyAllCount != null && isBuyAllCount > 0) { return Result.error("您已经购买过全集，请不要重复购买！"); } - List courseUserList = courseUserDao.selectList(Wrappers.lambdaQuery().select(CourseUser::getCourseDetailsId).eq(CourseUser::getCourseId, courseId).eq(CourseUser::getCourseUserId, userId)); + List courseUserList = courseUserDao.selectList(Wrappers.lambdaQuery() + .select(CourseUser::getCourseDetailsId) + .eq(CourseUser::getCourseId, courseId) + .eq(CourseUser::getUserId, userId) + .eq(CourseUser::getClassify, 2) + ); // 已购买剧集 List courseDetailsIdList = courseUserList.stream().map(CourseUser::getCourseDetailsId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); From b112da418eb7a2f1e2c3b821f0a0efaf56a85c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 24 Dec 2024 15:33:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=86=E6=89=B9=E6=AC=A110=E9=9B=86?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/orders/service/impl/OrdersServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index 13f8d9be..8fc39199 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -379,6 +379,7 @@ public class OrdersServiceImpl extends ServiceImpl implements .eq(CourseUser::getCourseId, courseId) .eq(CourseUser::getUserId, userId) .eq(CourseUser::getClassify, 2) + .orderByAsc(CourseUser::getCourseDetailsId) ); // 已购买剧集 List courseDetailsIdList = courseUserList.stream().map(CourseUser::getCourseDetailsId).filter(Objects::nonNull).distinct().collect(Collectors.toList());