zoujiajian 2 tahun lalu
induk
melakukan
ba2d233932

+ 68 - 0
netflix-dao/src/main/java/com/cyksj/model/views/GoodsWholesaleView.java

@@ -0,0 +1,68 @@
+package com.cyksj.model.views;
+
+import com.cyksj.model.entity.GoodsWholesale;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GoodsWholesaleView
+ * 创建者: JavaZou
+ * 创建时间:2024/8/29 12:07
+ */
+@Getter
+@Setter
+@SearchBean(tables = "goods_wholesale gw left join goods_don g on g.id = gw.goods_id" +
+		" left join goods_don_sku sku on sku.id = gw.sku_id")
+public class GoodsWholesaleView {
+	@DbField("gw.id")
+	private Long id;
+
+	@DbField("g.id")
+	private Long goodsId;
+
+	@DbField("g.title")
+	private String title;
+
+	@DbField("sku.id")
+	private Long skuId;
+
+	@DbField("sku.spec_val")
+	private String specVal;
+
+	@DbField("gw.status")
+	private Boolean status;
+
+	@DbField("gw.sorted")
+	private Integer sorted;
+
+	@DbField("gw.config")
+	private String config;
+
+	@DbIgnore
+	private List<GoodsWholesale.GoodsWholesaleConfig> wholesaleConfig;
+
+	/**
+	 * 返差价
+	 */
+	@DbField("gw.is_return")
+	private Boolean isReturn;
+
+	/**
+	 * 图片
+	 */
+	@DbField("gw.picture")
+	private String picture;
+
+	@DbField("gw.created_time")
+	private Date createdTime;
+
+	@DbField("gw.update_time")
+	private Date updateTime;
+}

+ 3 - 2
netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonWholeSaleController.java

@@ -14,6 +14,7 @@ import com.cyksj.model.GoodsWholesaleUserRequirementRecord;
 import com.cyksj.model.entity.GoodsWholesale;
 import com.cyksj.model.entity.GoodsWholesaleUserDeposit;
 import com.cyksj.model.views.GoodsWholesaleOrderView;
+import com.cyksj.model.views.GoodsWholesaleView;
 import com.cyksj.service.goods.GoodsWholesaleService;
 import com.cyksj.service.user.UserBindRelationService;
 import com.ejlchina.searcher.BeanSearcher;
@@ -89,8 +90,8 @@ public class CmsGoodsDonWholeSaleController {
 	 * 批发平台列表
 	 */
 	@GetMapping("/get")
-	public Result<SearchResult<GoodsWholesale>> getWholesale() {
-		SearchResult<GoodsWholesale> search = beanSearcher.search(GoodsWholesale.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+	public Result<SearchResult<GoodsWholesaleView>> getWholesale() {
+		SearchResult<GoodsWholesaleView> search = beanSearcher.search(GoodsWholesaleView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
 		search.getDataList().forEach(data->{
 			try {
 				data.setWholesaleConfig(Jsons.parseList(data.getConfig(), GoodsWholesale.GoodsWholesaleConfig.class));