diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java index 4c2fe646..aea571ea 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java @@ -27,6 +27,7 @@ import co.yixiang.utils.FileUtil; import co.yixiang.utils.OrderUtil; import co.yixiang.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -139,11 +140,12 @@ public class YxUserBillServiceImpl extends BaseServiceImpl spreadOrder(Long uid, int page, int limit) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(YxUserBill::getUid, uid) + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().in(YxUserBill::getUid, uid) .eq(YxUserBill::getType, BillDetailEnum.TYPE_2.getValue()) .eq(YxUserBill::getCategory, BillDetailEnum.CATEGORY_1.getValue()); - wrapper.orderByDesc(YxUserBill::getCreateTime).groupBy(YxUserBill::getCreateTime); + wrapper.lambda().orderByDesc(YxUserBill::getCreateTime); + wrapper.groupBy("time"); Page pageModel = new Page<>(page, limit); List list = yxUserBillMapper.getBillOrderList(wrapper, pageModel); @@ -180,32 +182,32 @@ public class YxUserBillServiceImpl extends BaseServiceImpl getUserBillList(int page, int limit, long uid, int type) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(YxUserBill::getUid,uid).orderByDesc(YxUserBill::getId); - wrapper.groupBy(YxUserBill::getCreateTime); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().eq(YxUserBill::getUid,uid).orderByDesc(YxUserBill::getId); + wrapper.groupBy("time"); switch (BillInfoEnum.toType(type)){ case PAY_PRODUCT: - wrapper.eq(YxUserBill::getCategory,BillDetailEnum.CATEGORY_1.getValue()); - wrapper.eq(YxUserBill::getType,BillDetailEnum.TYPE_3.getValue()); + wrapper.lambda().eq(YxUserBill::getCategory,BillDetailEnum.CATEGORY_1.getValue()); + wrapper.lambda().eq(YxUserBill::getType,BillDetailEnum.TYPE_3.getValue()); break; case RECHAREGE: - wrapper.eq(YxUserBill::getCategory,BillDetailEnum.CATEGORY_1.getValue()); - wrapper.eq(YxUserBill::getType,BillDetailEnum.TYPE_1.getValue()); + wrapper.lambda().eq(YxUserBill::getCategory,BillDetailEnum.CATEGORY_1.getValue()); + wrapper.lambda().eq(YxUserBill::getType,BillDetailEnum.TYPE_1.getValue()); break; case BROKERAGE: - wrapper.eq(YxUserBill::getCategory,BillDetailEnum.CATEGORY_1.getValue()); - wrapper.eq(YxUserBill::getType,BillDetailEnum.TYPE_2.getValue()); + wrapper.lambda().eq(YxUserBill::getCategory,BillDetailEnum.CATEGORY_1.getValue()); + wrapper.lambda().eq(YxUserBill::getType,BillDetailEnum.TYPE_2.getValue()); break; case EXTRACT: - wrapper.eq(YxUserBill::getCategory,BillDetailEnum.CATEGORY_1.getValue()); - wrapper.eq(YxUserBill::getType,BillDetailEnum.TYPE_4.getValue()); + wrapper.lambda().eq(YxUserBill::getCategory,BillDetailEnum.CATEGORY_1.getValue()); + wrapper.lambda().eq(YxUserBill::getType,BillDetailEnum.TYPE_4.getValue()); break; case SIGN_INTEGRAL: - wrapper.eq(YxUserBill::getCategory,BillDetailEnum.CATEGORY_2.getValue()); - wrapper.eq(YxUserBill::getType,BillDetailEnum.TYPE_10.getValue()); + wrapper.lambda().eq(YxUserBill::getCategory,BillDetailEnum.CATEGORY_2.getValue()); + wrapper.lambda().eq(YxUserBill::getType,BillDetailEnum.TYPE_10.getValue()); break; default: - wrapper.eq(YxUserBill::getCategory,BillDetailEnum.CATEGORY_1.getValue()); + wrapper.lambda().eq(YxUserBill::getCategory,BillDetailEnum.CATEGORY_1.getValue()); } Page pageModel = new Page<>(page, limit);