Merge branch 'master' into pre

netflix-dao/src/main/java/com/cyksj/model/views/DisableAccountView.java

@@ -0,0 +1,39 @@
+package com.cyksj.model.views;
+
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: DisableAccountView
+ * 创建者: JavaZou
+ * 创建时间:2024/6/28 13:42
+ */
+@Getter
+@Setter
+@SearchBean(tables = "(select goods_id,sku_id,account,any_value(created_time) as created_time from user_ticket_cleared_record where account != '' and source = 'disable' group by goods_id,sku_id,account) ur" +
+		" left join goods_don g on g.id = ur.goods_id" +
+		" left join goods_don_sku sku on sku.id = ur.sku_id")
+public class DisableAccountView {
+	@DbField("g.id")
+	private Long goodsId;
+
+	@DbField("g.title")
+	private String title;
+
+	@DbField("ur.account")
+	private String account;
+
+	@DbField("sku.id")
+	private Long skuId;
+
+	@DbField("sku.spec_val")
+	private String specVal;
+
+	@DbField("ur.created_time")
+	private Date createdTime;
+}

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

@@ -23,6 +23,7 @@ import com.cyksj.mapper.manage.cms.CmsUserMapper;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.manage.views.AccountView;
 import com.cyksj.model.manage.views.GroupsRelationBackView;
+import com.cyksj.model.views.DisableAccountView;
 import com.cyksj.model.views.GroupsRelationIndependentView;
 import com.cyksj.model.views.GroupsRelationRechargeView;
 import com.cyksj.model.views.OrderDonRenewView;
@@ -251,4 +252,15 @@ public class CmsGroupRelationController {
         groupRelationClearService.clearTicket(relation, UserTicketClearedRecord.Source.manual);
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }
+
+    /**
+     * GPT PLUS 禁用账号列表
+     */
+    @GetMapping("/get/disable/account")
+    public Result<SearchResult<DisableAccountView>> getDisableAccount() {
+        SearchResult<DisableAccountView> search = beanSearcher.search(DisableAccountView.class, MapUtils.flatBuilder(request.getParameterMap())
+                .field(DisableAccountView::getGoodsId, 18)
+                .build());
+        return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+    }
 }