|
|
@@ -29,6 +29,7 @@ import com.cyksj.service.scheduler.SchedulerService;
|
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
|
import com.ejlchina.searcher.SearchResult;
|
|
|
import com.ejlchina.searcher.param.Operator;
|
|
|
+import com.ejlchina.searcher.util.MapBuilder;
|
|
|
import com.ejlchina.searcher.util.MapUtils;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
@@ -90,10 +91,13 @@ public class CmsGroupRelationController {
|
|
|
* 代充平台 用户账号车票列表
|
|
|
*/
|
|
|
@GetMapping("/get/recharge")
|
|
|
- public Result<SearchResult<GroupsRelationRechargeView>> getRechargeList() {
|
|
|
- SearchResult<GroupsRelationRechargeView> search = beanSearcher.search(GroupsRelationRechargeView.class, MapUtils.flatBuilder(request.getParameterMap())
|
|
|
+ public Result<SearchResult<GroupsRelationRechargeView>> getRechargeList(String rechargeStatus) {
|
|
|
+ MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
+ if (StrUtil.isEmpty(rechargeStatus)) {
|
|
|
+ builder.field(GroupsRelationRechargeView::getRechargeStatus).op(Operator.NotNull);
|
|
|
+ }
|
|
|
+ SearchResult<GroupsRelationRechargeView> search = beanSearcher.search(GroupsRelationRechargeView.class,builder
|
|
|
.field(GroupsRelationRechargeView::getStatus, List.of(GroupsRelation.Status.validity.name(), GroupsRelation.Status.outside.name())).op(Operator.InList)
|
|
|
- .field(GroupsRelationRechargeView::getRechargeStatus).op(Operator.NotNull)
|
|
|
.build());
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(search);
|
|
|
}
|