czg_team
/
video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2024-12-24 15:41:36 +08:00
parent 9129feb204 b112da418e
commit 24571a7c64
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java
View File

@ -37,7 +37,6 @@ import com.sqx.modules.orders.service.OrdersService;
import com.sqx.modules.pay.controller.app.AliPayController; import com.sqx.modules.pay.controller.app.AliPayController;
import com.sqx.modules.pay.service.DyService; import com.sqx.modules.pay.service.DyService;
import com.sqx.modules.pay.service.WxService; import com.sqx.modules.pay.service.WxService;
import com.sqx.modules.sdk.entity.SdkInfo;
import com.sqx.modules.utils.AliPayOrderUtil; import com.sqx.modules.utils.AliPayOrderUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -108,12 +107,8 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
CourseUser courseUser = new CourseUser(); CourseUser courseUser = new CourseUser();
//设置短剧id //设置短剧id
courseUser.setCourseId(orders.getCourseId()); courseUser.setCourseId(orders.getCourseId());
courseUser.setCourseDetailsId(orders.getCourseDetailsId()); courseUser.setCourseDetailsId(courseDetailsId);
if (courseUser.getCourseDetailsId() != null) {
courseUser.setClassify(2); courseUser.setClassify(2);
} else {
courseUser.setClassify(1);
}
//设置用户id //设置用户id
courseUser.setUserId(orders.getUserId()); courseUser.setUserId(orders.getUserId());
//设置订单id //设置订单id
@ -379,7 +374,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
if (isBuyAllCount != null && isBuyAllCount > 0) { if (isBuyAllCount != null && isBuyAllCount > 0) {
return Result.error("您已经购买过全集，请不要重复购买！"); return Result.error("您已经购买过全集，请不要重复购买！");
} }
List<CourseUser> courseUserList = courseUserDao.selectList(Wrappers.<CourseUser>lambdaQuery().select(CourseUser::getCourseDetailsId).eq(CourseUser::getCourseId, courseId).eq(CourseUser::getCourseUserId, userId)); List<CourseUser> courseUserList = courseUserDao.selectList(Wrappers.<CourseUser>lambdaQuery()
.select(CourseUser::getCourseDetailsId)
.eq(CourseUser::getCourseId, courseId)
.eq(CourseUser::getUserId, userId)
.eq(CourseUser::getClassify, 2)
.orderByAsc(CourseUser::getCourseDetailsId)
);
// 已购买剧集 // 已购买剧集
List<Long> courseDetailsIdList = courseUserList.stream().map(CourseUser::getCourseDetailsId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); List<Long> courseDetailsIdList = courseUserList.stream().map(CourseUser::getCourseDetailsId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
LambdaQueryWrapper<CourseDetails> wrapper = Wrappers.<CourseDetails>lambdaQuery(); LambdaQueryWrapper<CourseDetails> wrapper = Wrappers.<CourseDetails>lambdaQuery();