|
|
@@ -397,11 +397,10 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
|
|
|
if (StringUtils.hasText(orderStatus)) {
|
|
|
queryWrapper.in("lco.order_status", Collections.singletonList(orderStatus));
|
|
|
} else {
|
|
|
- // 默认查询进行中和已完成的订单
|
|
|
- Integer inProgressStatus = LawyerStatusEnum.INPROGRESS.getStatus();
|
|
|
- Integer completeStatus = LawyerStatusEnum.COMPLETE.getStatus();
|
|
|
- queryWrapper.in("lco.order_status", Arrays.asList(
|
|
|
- String.valueOf(inProgressStatus), String.valueOf(completeStatus)));
|
|
|
+ // 默认查询非待支付的订单
|
|
|
+ Integer waitPayStatus = LawyerStatusEnum.WAIT_PAY.getStatus();
|
|
|
+ queryWrapper.notIn("lco.order_status", Collections.singletonList(
|
|
|
+ String.valueOf(waitPayStatus)));
|
|
|
}
|
|
|
|
|
|
// 律师ID条件
|