Merge branch 'home_page_func' into pre

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

@@ -0,0 +1,71 @@
+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;
+
+/*
+ *项目名: netflix
+ *文件名: GoodsDonCategoryDetailView
+ *创建者: JavaZou
+ *创建时间:2023/9/1 13:48
+ */
+@Getter
+@Setter
+@SearchBean(tables = "goods_don g left join goods_don_category gc on gc.id = g.category")
+public class GoodsDonCategoryDetailView {
+	@DbField("g.id")
+	private Long id;
+
+	/**
+	 * 商品名称
+	 */
+	@DbField("g.title")
+	private String title;
+
+	/**
+	 * true 上架 / false 下架
+	 */
+	@DbField("g.status")
+	private Boolean status;
+
+	@DbField("g.deleted")
+	private Boolean deleted;
+
+	@DbField("g.logo")
+	private String logo;
+
+	@DbField("g.type")
+	private Integer type;
+
+	@DbField("g.category")
+	private Long category;
+
+	/**
+	 * 分类
+	 * 1、AI  2、流媒体
+	 */
+	@DbField("gc.name")
+	private String categoryTitle;
+
+	/**
+	 * 排序
+	 */
+	@DbField("g.sort_by")
+	private Integer sortBy;
+
+	/**
+	 * 虚拟销量
+	 */
+	@DbField("g.virtual_sold")
+	private Integer virtualSold;
+
+	@DbField("g.created_time")
+	private Date createdTime;
+
+	@DbField("g.update_time")
+	private Date updateTime;
+}

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonController.java

@@ -15,6 +15,7 @@ import com.cyksj.model.entity.GoodsDon;
 import com.cyksj.model.entity.GoodsDonSku;
 import com.cyksj.model.manage.request.ReqGoodsSpuInsert;
 import com.cyksj.model.manage.views.GoodsDonViewer;
+import com.cyksj.model.views.GoodsDonCategoryDetailView;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.mange.CmsGoodsDonService;
 import com.ejlchina.searcher.BeanSearcher;
@@ -50,9 +51,9 @@ public class CmsGoodsDonController {
     private final RedisService redisService;
 
     @GetMapping("/get")
-    public Result<SearchResult<GoodsDon>> get(){
-        SearchResult<GoodsDon> search = beanSearcher.search(GoodsDon.class, MapUtils.flatBuilder(request.getParameterMap())
-                .field(GoodsDon::getDeleted,true)
+    public Result<SearchResult<GoodsDonCategoryDetailView>> get(){
+        SearchResult<GoodsDonCategoryDetailView> search = beanSearcher.search(GoodsDonCategoryDetailView.class, MapUtils.flatBuilder(request.getParameterMap())
+                .field(GoodsDonCategoryDetailView::getDeleted,true)
                 .build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }