From a50c7d1497d7f707b79597553d9db978ba7e9dd5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 十二月 2024 08:59:12 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java
index 06cd114..2c6aad6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCourseController.java
@@ -107,16 +107,26 @@
@PostMapping(value = "/list")
public R<Page<TCourse>> list(@RequestBody CourseQuery informationQuery) {
Long userId = tokenService.getLoginUser().getUserId();
-
- Page<TCourse> page = courseService.lambdaQuery()
- .like(!StringUtils.isEmpty(informationQuery.getName()), TCourse::getCourseName, informationQuery.getName())
- .eq(informationQuery.getRegionId() != null, TCourse::getRegionId, informationQuery.getRegionId())
- .eq(informationQuery.getTechnicalId() != null, TCourse::getTechnicalId, informationQuery.getTechnicalId())
- .eq(informationQuery.getMajorId() != null, TCourse::getMajorId, informationQuery.getMajorId())
- .eq(informationQuery.getLevel() != null, TCourse::getLevel, informationQuery.getLevel())
- .orderByDesc(TCourse::getCommitteeSort)
- .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
-
+ Page<TCourse> page;
+ if (informationQuery.getSortType()==1){
+ page = courseService.lambdaQuery()
+ .like(!StringUtils.isEmpty(informationQuery.getName()), TCourse::getCourseName, informationQuery.getName())
+ .eq(informationQuery.getRegionId() != null, TCourse::getRegionId, informationQuery.getRegionId())
+ .eq(informationQuery.getTechnicalId() != null, TCourse::getTechnicalId, informationQuery.getTechnicalId())
+ .eq(informationQuery.getMajorId() != null, TCourse::getMajorId, informationQuery.getMajorId())
+ .eq(informationQuery.getLevel() != null, TCourse::getLevel, informationQuery.getLevel())
+ .orderByDesc(TCourse::getCreateTime)
+ .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
+ }else {
+ page = courseService.lambdaQuery()
+ .like(!StringUtils.isEmpty(informationQuery.getName()), TCourse::getCourseName, informationQuery.getName())
+ .eq(informationQuery.getRegionId() != null, TCourse::getRegionId, informationQuery.getRegionId())
+ .eq(informationQuery.getTechnicalId() != null, TCourse::getTechnicalId, informationQuery.getTechnicalId())
+ .eq(informationQuery.getMajorId() != null, TCourse::getMajorId, informationQuery.getMajorId())
+ .eq(informationQuery.getLevel() != null, TCourse::getLevel, informationQuery.getLevel())
+ .orderByDesc(TCourse::getCommitteeSort)
+ .page(Page.of(informationQuery.getPageNum(), informationQuery.getPageSize()));
+ }
Set<Long> cacheSet = redisCache.getCacheSet("COURSE:" + userId);
@@ -142,6 +152,12 @@
}else {
record.setStudyNum(cacheSet1.size());
}
+
+ Long count = orderService.lambdaQuery()
+ .eq(TOrder::getGoodId, record.getId())
+ .eq(TOrder::getGoodType, 1)
+ .eq(TOrder::getPaymentStatus, 2).count();
+ record.setBuyNum(Integer.parseInt(String.valueOf(count)));
}
return R.ok(page);
@@ -303,7 +319,7 @@
prepayRequest.setMchid(weChatConfig.merchantId);
prepayRequest.setOutTradeNo(byId.getCode());
prepayRequest.setDescription("购买课程");
- prepayRequest.setNotifyUrl("http://www.zhipingwang.com.cn:8081/call-back/buy");
+ prepayRequest.setNotifyUrl("http://vwpmxwbhv59i.guyubao.com/call-back/buy");
com.wechat.pay.java.service.payments.nativepay.model.Amount amount = new com.wechat.pay.java.service.payments.nativepay.model.Amount();
amount.setTotal(byId.getPaymentAmount().multiply(new BigDecimal(100)).intValue());
prepayRequest.setAmount(amount);
@@ -381,6 +397,14 @@
if (!cacheSet.isEmpty()) {
Page<TCourse> page = courseService.lambdaQuery().in(TCourse::getId, cacheSet).page(Page.of(basePage.getPageNum(), basePage.getPageSize()));
+ for (TCourse record : page.getRecords()) {
+ Set<Object> cacheSet1 = redisCache.getCacheSet("STUDY:" + record.getId());
+ if (cacheSet1==null){
+ record.setStudyNum(0);
+ }else {
+ record.setStudyNum(cacheSet1.size());
+ }
+ }
return R.ok(page);
}else {
return R.ok(new Page<>());
--
Gitblit v1.7.1