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..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 @@ -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; @@ -108,12 +107,8 @@ public class OrdersServiceImpl extends ServiceImpl implements CourseUser courseUser = new CourseUser(); //设置短剧id courseUser.setCourseId(orders.getCourseId()); - courseUser.setCourseDetailsId(orders.getCourseDetailsId()); - if (courseUser.getCourseDetailsId() != null) { - courseUser.setClassify(2); - } else { - courseUser.setClassify(1); - } + courseUser.setCourseDetailsId(courseDetailsId); + courseUser.setClassify(2); //设置用户id courseUser.setUserId(orders.getUserId()); //设置订单id @@ -379,7 +374,13 @@ 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) + .orderByAsc(CourseUser::getCourseDetailsId) + ); // 已购买剧集 List courseDetailsIdList = courseUserList.stream().map(CourseUser::getCourseDetailsId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery();