zoujiajian 1 год назад
Родитель
Сommit
f8fd3d4ce1

+ 2 - 1
netflix-dao/src/main/java/com/cyksj/model/views/GroupsRelationRechargeView.java

@@ -22,7 +22,8 @@ import java.util.Date;
 @SearchBean(tables = "groups_relation gr left join groups_trips gt on gt.id = gr.groups_id" +
 		" left join goods_don_sku gdk on gdk.id = gt.sku_id " +
 		" left join goods_don g on g.id = gdk.goods_id" +
-		" left join user u on u.id = gr.user_id")
+		" left join user u on u.id = gr.user_id",
+		where = ":errorInfo:")
 public class GroupsRelationRechargeView {
 
 	@DbField("gr.id")

+ 10 - 2
netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupRelationController.java

@@ -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())