|
@@ -1990,19 +1990,10 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public PageUtils selectIndentPage(Integer page, Integer limit, String acquireCode, Long userId) {
|
|
public PageUtils selectIndentPage(Integer page, Integer limit, String acquireCode, Long userId) {
|
|
|
-// 2:已支付3:骑手已接单4:骑手已取货/购买
|
|
|
|
|
- List<Integer> states = new ArrayList<>();
|
|
|
|
|
- states.add(2);
|
|
|
|
|
- states.add(3);
|
|
|
|
|
- states.add(4);
|
|
|
|
|
IPage<TbIndent> pages = new Page<>(page, limit);
|
|
IPage<TbIndent> pages = new Page<>(page, limit);
|
|
|
QueryWrapper<TbIndent> queryWrapper = new QueryWrapper();
|
|
QueryWrapper<TbIndent> queryWrapper = new QueryWrapper();
|
|
|
- queryWrapper.like(StrUtil.isNotBlank(acquireCode), "order_id", acquireCode);
|
|
|
|
|
- queryWrapper.in("indent_state", states);
|
|
|
|
|
- queryWrapper.and(qw -> qw.isNull("rider_user_id").or().eq("rider_user_id", userId));
|
|
|
|
|
- queryWrapper.orderByAsc("create_time");
|
|
|
|
|
|
|
+ queryWrapper.eq("order_id", acquireCode);
|
|
|
IPage<TbIndent> result = baseMapper.selectPage(pages, queryWrapper);
|
|
IPage<TbIndent> result = baseMapper.selectPage(pages, queryWrapper);
|
|
|
-
|
|
|
|
|
return new PageUtils(result);
|
|
return new PageUtils(result);
|
|
|
}
|
|
}
|
|
|
|
|
|