zoujiajian 3 лет назад
Родитель
Сommit
8eb964555a

+ 1 - 19
netflix-dao/src/main/java/com/cyksj/model/entity/UserDistributeBusinessRate.java

@@ -1,8 +1,5 @@
 package com.cyksj.model.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.ejlchina.searcher.bean.DbField;
-import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,45 +13,30 @@ import javax.validation.constraints.NotNull;
  */
 @Getter
 @Setter
-@SearchBean(tables = "user_distribute_business_rate ur left join goods_don g on g.id = ur.goods_id" +
-		" left join goods_don_sku gdk on gdk.id = ur.sku_id")
-public class UserDistributeBusinessRate extends BaseEntity{
+public class UserDistributeBusinessRate extends BaseEntity {
 	/**
 	 * 商务用户id
 	 */
 	@NotNull
-	@DbField("ur.business_id")
 	private Long businessId;
 
 	/**
 	 * 平台id
 	 */
-	@DbField("ur.goods_id")
 	private Long goodsId;
 
-	@DbField("g.title")
-	@TableField(exist = false)
-	private String goodsName;
-
 	/**
 	 * 规格id
 	 */
-	@DbField("ur.sku_id")
 	private Long skuId;
 
-	@DbField("gdk.spec_val")
-	@TableField(exist = false)
-	private String specVal;
-
 	/**
 	 * 首单提成比例
 	 */
-	@DbField("ur.first_order_rate")
 	private Integer firstOrderRate;
 
 	/**
 	 * 首单续费提成比例
 	 */
-	@DbField("ur.renew_order_rate")
 	private Integer renewOrderRate;
 }

+ 60 - 0
netflix-dao/src/main/java/com/cyksj/model/views/UserDistributeBusinessRateRecordView.java

@@ -0,0 +1,60 @@
+package com.cyksj.model.views;
+
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/*
+ *项目名: netflix
+ *文件名: UserDistributeBusinessRateRecordView
+ *创建者: JavaZou
+ *创建时间:2023/3/27 15:53
+ */
+@Getter
+@Setter
+@SearchBean(tables = "user_distribute_business_rate ur left join goods_don g on g.id = ur.goods_id" +
+		" left join goods_don_sku gdk on gdk.id = ur.sku_id")
+public class UserDistributeBusinessRateRecordView {
+	@DbField("ur.id")
+	private Long id;
+
+	/**
+	 * 商务用户id
+	 */
+	@NotNull
+	@DbField("ur.business_id")
+	private Long businessId;
+
+	/**
+	 * 平台id
+	 */
+	@DbField("ur.goods_id")
+	private Long goodsId;
+
+	@DbField("g.title")
+	private String goodsName;
+
+	/**
+	 * 规格id
+	 */
+	@DbField("ur.sku_id")
+	private Long skuId;
+
+	@DbField("gdk.spec_val")
+	private String specVal;
+
+	/**
+	 * 首单提成比例
+	 */
+	@DbField("ur.first_order_rate")
+	private Integer firstOrderRate;
+
+	/**
+	 * 首单续费提成比例
+	 */
+	@DbField("ur.renew_order_rate")
+	private Integer renewOrderRate;
+}

+ 4 - 4
netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -437,10 +437,10 @@ public class DistributeController {
 	 */
 	@GetMapping("/get/business/rate")
 	@SaCheckPermission("distribute:businessRateView")
-	public Result<List<UserDistributeBusinessRate>> getUserDistributeBusinessRateDetail(Long id) {
-		List<UserDistributeBusinessRate> userDistributeBusinessRate = beanSearcher.searchAll(UserDistributeBusinessRate.class, MapUtils.builder()
-				.field(UserDistributeBusinessRate::getBusinessId, id)
-				.orderBy(UserDistributeBusinessRate::getGoodsId).asc()
+	public Result<List<UserDistributeBusinessRateRecordView>> getUserDistributeBusinessRateDetail(Long id) {
+		List<UserDistributeBusinessRateRecordView> userDistributeBusinessRate = beanSearcher.searchAll(UserDistributeBusinessRateRecordView.class, MapUtils.builder()
+				.field(UserDistributeBusinessRateRecordView::getBusinessId, id)
+				.orderBy(UserDistributeBusinessRateRecordView::getGoodsId).asc()
 				.build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(userDistributeBusinessRate);
 	}