zoujiajian 2 жил өмнө
parent
commit
0f69147349

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/manage/entity/YhShop.java

@@ -52,6 +52,11 @@ public class YhShop extends BaseEntity {
 	 */
 	private String reason;
 
+	/**
+	 * 联系方式
+	 */
+	private String contact;
+
 	@Getter
 	public enum Status {
 		verify("审核中"),

+ 5 - 2
netflix-dao/src/main/java/com/cyksj/model/views/YhShopGoodsRateView.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2023/9/14 14:20
  */
 @Data
-@SearchBean(tables = "goods_don g",
+@SearchBean(tables = "goods_don g left join goods_don_category gc on gc.id = g.category",
         where = "g.status = true and g.deleted = true")
 public class YhShopGoodsRateView {
     @DbField("g.id")
@@ -23,7 +23,10 @@ public class YhShopGoodsRateView {
     private String title;
 
     @DbField("g.category")
-    private Integer category;
+    private Long category;
+
+    @DbField("gc.name")
+    private String categoryName;
 
     @DbIgnore
     private List<YhShopGoodsSkuRateView> list;

+ 3 - 2
netflix-dao/src/main/java/com/cyksj/model/views/YhShopView.java

@@ -1,5 +1,6 @@
 package com.cyksj.model.views;
 
+import com.cyksj.model.manage.entity.YhShop;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
@@ -52,8 +53,8 @@ public class YhShopView {
 	/**
 	 * 是否审核通过
 	 */
-	@DbField("ys.is_approve")
-	private Boolean isApprove;
+	@DbField("ys.verify_status")
+	private YhShop.Status verifyStatus;
 
 	/**
 	 * 店铺开放状态

+ 2 - 1
netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsYhShopGoodsController.java

@@ -39,6 +39,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 
 /**
+ * admin/小店店铺/银河后台
  * @author zwhui
  * @date 2023/9/14 16:42
  */
@@ -363,7 +364,7 @@ public class CmsYhShopGoodsController {
     @GetMapping("/get/apply")
     public Result<SearchResult<YhShopView>> getUserShopApply() {
         SearchResult<YhShopView> search = beanSearcher.search(YhShopView.class, MapUtils.flatBuilder(request.getParameterMap())
-                .field(YhShopView::getIsApprove, false)
+                .field(YhShopView::getVerifyStatus, YhShop.Status.verify)
                 .build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }