|
@@ -173,14 +173,14 @@ public class UserExamGoodsServiceImpl extends ServiceImpl<UserExamGoodsMapper, U
|
|
if(Validator.isNotEmpty(examGoodsVo)){
|
|
if(Validator.isNotEmpty(examGoodsVo)){
|
|
if(entity.getStatus()==1){
|
|
if(entity.getStatus()==1){
|
|
//补考
|
|
//补考
|
|
- if((examGoodsVo.getExamNumber().longValue()-examGoodsVo.getExpendNumber().longValue())>entity.getExamNumber()){
|
|
|
|
|
|
+ if((examGoodsVo.getExamNumber().longValue()-examGoodsVo.getExpendNumber().longValue())>=entity.getExamNumber()){
|
|
//剩余次数大于购买时绑定次数
|
|
//剩余次数大于购买时绑定次数
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else if(entity.getStatus()==2){
|
|
else if(entity.getStatus()==2){
|
|
//前培
|
|
//前培
|
|
- if((examGoodsVo.getDoNumber().longValue()-examGoodsVo.getExpendBefore().longValue())>entity.getDoNumber()){
|
|
|
|
|
|
+ if((examGoodsVo.getDoNumber().longValue()-examGoodsVo.getExpendBefore().longValue())>=entity.getDoNumber()){
|
|
//剩余次数大于购买时绑定次数
|
|
//剩余次数大于购买时绑定次数
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
@@ -201,7 +201,7 @@ public class UserExamGoodsServiceImpl extends ServiceImpl<UserExamGoodsMapper, U
|
|
if(Validator.isNotEmpty(examGoodsVo)){
|
|
if(Validator.isNotEmpty(examGoodsVo)){
|
|
if(entity.getStatus()==1){
|
|
if(entity.getStatus()==1){
|
|
//补考
|
|
//补考
|
|
- if((examGoodsVo.getExamNumber().longValue()-examGoodsVo.getExpendNumber().longValue())>entity.getExamNumber()){
|
|
|
|
|
|
+ if((examGoodsVo.getExamNumber().longValue()-examGoodsVo.getExpendNumber().longValue())>=entity.getExamNumber()){
|
|
//减去补考次数
|
|
//减去补考次数
|
|
LambdaUpdateWrapper<UserExamGoods> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
|
|
LambdaUpdateWrapper<UserExamGoods> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
|
|
objectLambdaUpdateWrapper.eq(UserExamGoods::getUserId, bo.getUserId());
|
|
objectLambdaUpdateWrapper.eq(UserExamGoods::getUserId, bo.getUserId());
|
|
@@ -217,7 +217,7 @@ public class UserExamGoodsServiceImpl extends ServiceImpl<UserExamGoodsMapper, U
|
|
}
|
|
}
|
|
else if(entity.getStatus()==2){
|
|
else if(entity.getStatus()==2){
|
|
//前培
|
|
//前培
|
|
- if((examGoodsVo.getDoNumber().longValue()-examGoodsVo.getExpendBefore().longValue())>entity.getDoNumber()){
|
|
|
|
|
|
+ if((examGoodsVo.getDoNumber().longValue()-examGoodsVo.getExpendBefore().longValue())>=entity.getDoNumber()){
|
|
//减去前培次数
|
|
//减去前培次数
|
|
LambdaUpdateWrapper<UserExamGoods> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
|
|
LambdaUpdateWrapper<UserExamGoods> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
|
|
objectLambdaUpdateWrapper.eq(UserExamGoods::getUserId, bo.getUserId());
|
|
objectLambdaUpdateWrapper.eq(UserExamGoods::getUserId, bo.getUserId());
|