|
@@ -525,7 +525,7 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public IPage<LifeUserExpertOrderVo> getFinalPaymentList(Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String firstPayTime,String endPayTime,String firstCompleteTime,String endCompleteTime,String createdEndPaymentTime,String endEndPaymentTime,String name, Integer userId) {
|
|
|
|
|
|
|
+ public IPage<LifeUserExpertOrderVo> getFinalPaymentList(Integer page, Integer size,String realName, String userPhone, String advancePaymentStatus, String orderCreatedTime, String orderEndTime ,String firstPayTime,String endPayTime,String firstCompleteTime,String endCompleteTime,String createdEndPaymentTime,String endEndPaymentTime,String name, Integer userId ,String orderNo) {
|
|
|
QueryWrapper<LifeUserExpertVo> wrapper = new QueryWrapper<>();
|
|
QueryWrapper<LifeUserExpertVo> wrapper = new QueryWrapper<>();
|
|
|
wrapper.eq("ccc.delete_flag", 0);
|
|
wrapper.eq("ccc.delete_flag", 0);
|
|
|
wrapper.eq("user.delete_flag", 0);
|
|
wrapper.eq("user.delete_flag", 0);
|
|
@@ -534,6 +534,7 @@ public class LifeUserExpertServiceImpl extends ServiceImpl<LifeUserExpertMapper,
|
|
|
wrapper.eq("package.delete_flag",0);
|
|
wrapper.eq("package.delete_flag",0);
|
|
|
wrapper.like(StringUtils.isNotEmpty(realName), "user.real_name", realName);
|
|
wrapper.like(StringUtils.isNotEmpty(realName), "user.real_name", realName);
|
|
|
wrapper.like(StringUtils.isNotEmpty(userPhone), "user.user_phone", userPhone);
|
|
wrapper.like(StringUtils.isNotEmpty(userPhone), "user.user_phone", userPhone);
|
|
|
|
|
+ wrapper.like(StringUtils.isNotEmpty(orderNo), "ccc.order_no", orderNo);
|
|
|
if (advancePaymentStatus != null && !advancePaymentStatus.isEmpty()){
|
|
if (advancePaymentStatus != null && !advancePaymentStatus.isEmpty()){
|
|
|
wrapper.eq("ccc.advance_payment_status", advancePaymentStatus);
|
|
wrapper.eq("ccc.advance_payment_status", advancePaymentStatus);
|
|
|
}
|
|
}
|