zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
wangjinlei
2024-04-30 09:17:58 +08:00
parent 97e9aecd68
commit 871fc79cca
8 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
View File

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.PageUtils;
import com.peanut.common.utils.R;
import com.peanut.config.Constants;
@@ -831,7 +830,7 @@ public class BuyOrderController {
* @param totalPrice
* @return
*/
private boolean usePeanutCoin(MyUserEntity user, BigDecimal totalPrice,boolean sj_check,boolean scqq_check,boolean wylq_check,boolean prescript_b_check) {
private boolean usePeanutCoin(MyUserEntity user, BigDecimal totalPrice, boolean sj_check, boolean scqq_check, boolean wylq_check, boolean prescript_b_check) {
if (user.getPeanutCoin().compareTo(totalPrice) >= 0) {
user.setPeanutCoin(user.getPeanutCoin().subtract(totalPrice));
if (sj_check){

2
src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
View File

@@ -355,7 +355,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
public Page<BuyOrder> orderList(BuyOrderListRequestVo requestVo) {
MPJLambdaWrapper<BuyOrder> wrapper = new MPJLambdaWrapper<>();
wrapper.selectAll(BuyOrder.class);
wrapper.leftJoin(MyUserEntity.class,MyUserEntity::getId,BuyOrder::getUserId);
wrapper.leftJoin(MyUserEntity.class, MyUserEntity::getId,BuyOrder::getUserId);
wrapper.eq(StringUtils.isNotBlank(requestVo.getOrderStatus()),BuyOrder::getOrderStatus,requestVo.getOrderStatus());
wrapper.eq(BuyOrder::getOrderType,"order");
wrapper.gt(requestVo.getStartTime()!=null,BuyOrder::getCreateTime,requestVo.getStartTime());

2
src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java
View File

@@ -436,7 +436,7 @@ public class MyUserServiceImpl extends ServiceImpl<MyUserDao, MyUserEntity> impl
public boolean checkUserTelOrEmail(MyUserEntity user) {
LambdaQueryWrapper<MyUserEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.ne(MyUserEntity::getId,user.getId());
wrapper.and(l->l.eq(StringUtils.isNotBlank(user.getTel()),MyUserEntity::getTel,user.getTel()).or().eq(StringUtils.isNotBlank(user.getEmail()),MyUserEntity::getEmail,user.getEmail()));
wrapper.and(l->l.eq(StringUtils.isNotBlank(user.getTel()), MyUserEntity::getTel,user.getTel()).or().eq(StringUtils.isNotBlank(user.getEmail()), MyUserEntity::getEmail,user.getEmail()));
MyUserEntity one = getOne(wrapper);
return one == null;
}