|
|
@@ -110,7 +110,7 @@ public class CmsGroupRelationController {
|
|
|
* 代充平台 用户账号车票列表
|
|
|
*/
|
|
|
@GetMapping("/get/recharge")
|
|
|
- public Result<SearchResult<GroupsRelationRechargeView>> getRechargeList(String rechargeStatus, String orderNo) {
|
|
|
+ public Result<SearchResult<GroupsRelationRechargeView>> getRechargeList(String rechargeStatus, String orderNo, Boolean isVipError) {
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
if (StrUtil.isEmpty(rechargeStatus)) {
|
|
|
builder.field(GroupsRelationRechargeView::getRechargeStatus).op(Operator.NotNull);
|
|
|
@@ -126,10 +126,18 @@ public class CmsGroupRelationController {
|
|
|
}
|
|
|
builder.field(GroupsRelationRechargeView::getRelationId, relationId);
|
|
|
}
|
|
|
+ if (isVipError != null) {
|
|
|
+ builder.field(GroupsRelationRechargeView::getRechargeStatus, GroupsRelation.RechargeStatus.recharge_error);
|
|
|
+ if (isVipError) {
|
|
|
+ builder.field(GroupsRelationRechargeView::getRechargeErrorInfo, "会员").op(Operator.Contain);
|
|
|
+ } else {
|
|
|
+ builder.put("errorInfo", "(gr.recharge_error_info is null or gr.recharge_error_info not like '%会员%')");
|
|
|
+ }
|
|
|
+ }
|
|
|
SearchResult<GroupsRelationRechargeView> search = beanSearcher.search(GroupsRelationRechargeView.class, builder
|
|
|
.field(GroupsRelationRechargeView::getStatus, List.of(GroupsRelation.Status.validity.name(), GroupsRelation.Status.outside.name())).op(Operator.InList)
|
|
|
.build());
|
|
|
- search.getDataList().forEach(data->{
|
|
|
+ search.getDataList().forEach(data -> {
|
|
|
OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
|
|
|
.eq(OrderDon::getUserId, data.getUserId())
|
|
|
.eq(OrderDon::getRelationId, data.getRelationId())
|