From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
index 45bcdcc..3ba94f2 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -129,7 +129,6 @@
e.printStackTrace();
return ResultUtil.runErr();
}
-
}
@ResponseBody
@@ -159,9 +158,9 @@
@ApiOperation(value = "上课首页分配课时-课程列表", tags = {"APP-开始上课"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(value = "分配给课包id", name = "packetId", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "分配给课包id", name = "packetId", required = true, dataType = "Long"),
})
- public ResultUtil<Integer> weeksOfAddHours(Integer packetId){
+ public ResultUtil<Integer> weeksOfAddHours(Long packetId){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
@@ -169,10 +168,12 @@
}
TAppGift one = appGiftService.getOne(new LambdaQueryWrapper<TAppGift>().eq(TAppGift::getUserId, appUserId));
Boolean b= false;
+ Integer i=0;
if(one!=null && one.getNum()>0){
- b =appGiftService.weeksOfAddHours(packetId,appUserId,one.getNum());
+ i=appGiftService.weeksOfAddHours(packetId,appUserId,one.getNum());
+
}
- if(b){
+ if(i==1){
// 送完清0
one.setNum(0);
appGiftService.updateById(one);
--
Gitblit v1.7.1