|
@@ -134,6 +134,9 @@ public class OrderController {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private UserBindRelationService userBindRelationService;
|
|
private UserBindRelationService userBindRelationService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private GroupsRelationMapper relationMapper;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 支付
|
|
* 支付
|
|
|
* @author chan
|
|
* @author chan
|
|
@@ -889,10 +892,15 @@ public class OrderController {
|
|
|
if (relationId != null) {
|
|
if (relationId != null) {
|
|
|
builder.field(OrderDonView::getRelationId, relationId);
|
|
builder.field(OrderDonView::getRelationId, relationId);
|
|
|
}
|
|
}
|
|
|
|
|
+ GroupsRelation relation = relationMapper.selectById(relationId);
|
|
|
|
|
+ if (relation == null) {
|
|
|
|
|
+ return GatewayResponse.SUCCESS.newBuilder().toResult();
|
|
|
|
|
+ }
|
|
|
List<Long> userIds = UserBindRelationService.getRelationUserIdList(userId, null);
|
|
List<Long> userIds = UserBindRelationService.getRelationUserIdList(userId, null);
|
|
|
List<OrderDonView> list = beanSearcher.searchAll(OrderDonView.class, builder
|
|
List<OrderDonView> list = beanSearcher.searchAll(OrderDonView.class, builder
|
|
|
.field(OrderDonView::getUserId, userIds).op(Operator.InList)
|
|
.field(OrderDonView::getUserId, userIds).op(Operator.InList)
|
|
|
.field(OrderDonView::getOrderType, 2)
|
|
.field(OrderDonView::getOrderType, 2)
|
|
|
|
|
+ .field(OrderDonView::getCreatedTime, relation.getStartTime()).op(Operator.GreaterThan)
|
|
|
.orderBy(OrderDonView::getId).desc()
|
|
.orderBy(OrderDonView::getId).desc()
|
|
|
.build());
|
|
.build());
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(list);
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(list);
|