|
|
@@ -213,12 +213,14 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
if (StrUtil.isNotEmpty(orderNo)) {
|
|
|
conditionSql += String.format(" and exists(select 1 from order_don o where o.relation_id = gr.id and o.user_id = gr.user_id and o.order_no = %s and o.status not in ('close','noPayment','refund'))", orderNo);
|
|
|
}
|
|
|
+ if (isVip == null) {
|
|
|
+ builder.field(RenewalView::getIsVip, false);
|
|
|
+ }
|
|
|
SearchResult<RenewalView> list = beanSearcher.search(RenewalView.class, builder
|
|
|
.field(RenewalView::getUserId, 0).op(Operator.GreaterThan)
|
|
|
.field(RenewalView::getUserId, userIds).op(Operator.InList)
|
|
|
.put("condition", conditionSql)
|
|
|
.field(RenewalView::getStatus, List.of("validity", "overdue", "outside")).op(Operator.InList)
|
|
|
- .field(RenewalView::getIsVip, Optional.ofNullable(isVip).orElse(false))
|
|
|
.orderBy(RenewalView::getExpiryTime).asc()
|
|
|
.build());
|
|
|
if (list.getDataList().size() > 0) {
|
zoujiajian