fix 修改cps分销规格以及比例变更明细展示

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

@@ -0,0 +1,47 @@
+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;
+
+/**
+ * 项目名: yhlxj11111111
+ * 文件名: UserDistributeRateChangeRecordView
+ * 创建者: JavaZou
+ * 创建时间:2025/11/13 16:22
+ */
+@Getter
+@Setter
+@SearchBean(tables = "user_distribute_rate_change_record udr",
+where = "(udr.sku_id is null or not exists (select 1 from goods_don_sku sku where sku.id = udr.sku_id and sku.user_owns is not null))")
+public class UserDistributeRateChangeRecordView {
+	@DbField("udr.id")
+	private Long id;
+
+	@DbField("udr.distribute_id")
+	private Long distributeId;
+
+	@DbField("udr.user_id")
+	private Long userId;
+
+	@DbField("udr.goods_id")
+	private Long goodsId;
+
+	@DbField("udr.sku_id")
+	private Long skuId;
+
+	/**
+	 * 变更记录
+	 */
+	@DbField("udr.change_info")
+	private String changeInfo;
+
+	@DbField("udr.created_time")
+	private Date createdTime;
+
+	@DbField("udr.update_time")
+	private Date updateTime;
+}

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

@@ -16,7 +16,7 @@ import lombok.Setter;
 @SearchBean(tables = "goods_don gd left join goods_don_sku sku on sku.goods_id = gd.id" +
 		" left join user_plat_sku_distribute_rate up on sku.id = up.sku_id :dis_id:" +
 		" left join business_distribute_default_sku_rate_config bdc on bdc.sku_id = sku.id",
-		where = "gd.deleted is true and gd.status is true and gd.is_distribute is true and gd.is_sku_distribute is true and sku.status is true")
+		where = "gd.deleted is true and gd.status is true and gd.is_distribute is true and gd.is_sku_distribute is true and sku.status is true and sku.user_owns is null")
 public class UserSkuDistributeView {
 	@DbField("up.id")
 	private Long id;

netflix-web/src/main/java/com/cyksj/web/controller/cps/CpsDistribtueDataController.java

@@ -107,13 +107,17 @@ public class CpsDistribtueDataController {
 	 * 比例变更记录
 	 */
 	@GetMapping("/get/rate/record")
-	public Result<SearchResult<UserDistributeRateChangeRecord>> getRateRecord() {
+	public Result<SearchResult<UserDistributeRateChangeRecordView>> getRateRecord() {
 		long cpsUserId = StpCpsManageUser.getLoginIdAsLong();
 		UserDistribute userDistribute = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class)
 				.eq(UserDistribute::getUserId, cpsUserId)
 				.eq(UserDistribute::getDeleted, 1)
 				.last("limit 1"));
-		SearchResult<UserDistributeRateChangeRecord> search = beanSearcher.search(UserDistributeRateChangeRecord.class, MapUtils.flatBuilder(request.getParameterMap()).field(UserDistributeRateChangeRecord::getDistributeId, userDistribute.getId()).onlySelect(UserDistributeRateChangeRecord::getChangeInfo, UserDistributeRateChangeRecord::getCreatedTime).orderBy(UserDistributeRateChangeRecord::getId).desc().build());
+		SearchResult<UserDistributeRateChangeRecordView> search = beanSearcher.search(UserDistributeRateChangeRecordView.class, MapUtils.flatBuilder(request.getParameterMap())
+				.field(UserDistributeRateChangeRecordView::getDistributeId, userDistribute.getId())
+				.onlySelect(UserDistributeRateChangeRecordView::getChangeInfo, UserDistributeRateChangeRecordView::getCreatedTime)
+				.orderBy(UserDistributeRateChangeRecordView::getId).desc()
+				.build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}