From fcc10a5e34efae09c3c01b8e965b63657c6fdb15 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 02 七月 2024 10:57:53 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 24 +++---------------------
1 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index 98c4eb4..d91d2f2 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -164,27 +164,8 @@
PayVO payVO = new PayVO();
payVO.setOrderId(tVipOrder.getId());
payVO.setId(id);
-
-
return R.ok(payVO);
-// switch (payType) {
-// case 1:
-// return payMoneyUtil.weixinpay
-// ("购买会员", "",
-// id + "_" + tVipOrder.getId() + "_" +
-// UUIDUtil.getRandomCode(8),
-// tVipOrder.getMoney().toString(),
-// "/base/wxPayBuyVip", "APP", "");
-// case 2:
-// return payMoneyUtil.alipay
-// ("购买会员",
-// "购买会员下单支付",
-// "",
-// id + "_" + tVipOrder.getId() + "_" +
-// UUIDUtil.getRandomCode(8),
-// tVipOrder.getMoney().toString(),
-// "/base/aliPayBuyVip");
-// }
+
}
@@ -1054,7 +1035,8 @@
List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)
.eq(TStudy::getType, Constants.ONE)
.orderByAsc(TStudy::getWeek).list();
-
+ int size = studyService.residueWeek(studyRecord, studyList);
+ studyRecord.setSurplus(size);
res.setSurplus(studyRecord.getSurplus()+"");
res.setTotalHours(studyRecord.getTotalStudy().doubleValue());
res.setTodayHours(studyRecord.getTodayStudy().doubleValue());
--
Gitblit v1.7.1