fix

netflix-dao/src/main/java/com/cyksj/model/entity/UserDistributeRateChangeRecord.java

@@ -12,6 +12,8 @@ import lombok.Setter;
 @Getter
 @Setter
 public class UserDistributeRateChangeRecord extends BaseEntity{
+	private Long distributeId;
+
 	private Long userId;
 
 	private Long goodsId;

netflix-dao/src/main/resources/mapper/UserDistributeRateChangeRecordMapper.xml

@@ -6,10 +6,10 @@
 
     <insert id="batchInsertGoodsRateChangeRecord">
         insert into
-        user_distribute_rate_change_record(`user_id`,`goods_id`,`sku_id`,`change_info`,`created_time`,`update_time`)
+        user_distribute_rate_change_record(`distribute_id`,`user_id`,`goods_id`,`sku_id`,`change_info`,`created_time`,`update_time`)
         values
         <foreach collection="list" item="item" separator=",">
-            (#{item.userId},#{goodsId},#{skuId},#{changeInfo},now(),now())
+            (#{item.id},#{item.userId},#{goodsId},#{skuId},#{changeInfo},now(),now())
         </foreach>
     </insert>
 </mapper>

netflix-service/src/main/java/com/cyksj/service/distribute/impl/DistributeServiceImpl.java

@@ -230,7 +230,7 @@ public class DistributeServiceImpl implements DistributeService {
 			if (rate.getId() == null) {
 				try {
 					//平台比例更变记录
-					recordGoodsRateSaveChange(userDistribute.getUserId(), rate.getGoodsId(), rate.getRate(), goodsDon.getTitle(), userDistributeRateChangeRecords);
+					recordGoodsRateSaveChange(userDistribute, rate.getGoodsId(), rate.getRate(), goodsDon.getTitle(), userDistributeRateChangeRecords);
 					userPlatDistributeRateMapper.insert(rate);
 				} catch (DuplicateKeyException e) {
 					userPlatDistributeRateMapper.update(null, Wrappers.lambdaUpdate(UserPlatDistributeRate.class)
@@ -257,7 +257,7 @@ public class DistributeServiceImpl implements DistributeService {
 				UserPlatDistributeRate dbPlateRate = userPlatDistributeRateMapper.selectById(rate.getId());
 				if (dbPlateRate == null) {
 					//平台比例更变记录
-					recordGoodsRateSaveChange(userDistribute.getUserId(), rate.getGoodsId(), rate.getRate(), goodsDon.getTitle(), userDistributeRateChangeRecords);
+					recordGoodsRateSaveChange(userDistribute, rate.getGoodsId(), rate.getRate(), goodsDon.getTitle(), userDistributeRateChangeRecords);
 					continue;
 				}
 				if (dbPlateRate.getRate() != rate.getRate() || dbPlateRate.getSecondRate() != rate.getSecondRate()) {
@@ -271,7 +271,7 @@ public class DistributeServiceImpl implements DistributeService {
 					}
 					if (dbPlateRate.getRate() != rate.getRate()) {
 						//变更记录
-						recordGoodsRateChange(userDistribute.getUserId(), goodsDon.getTitle(), rate, userDistributeRateChangeRecords);
+						recordGoodsRateChange(userDistribute, goodsDon.getTitle(), rate, userDistributeRateChangeRecords);
 					}
 				}
 			}
@@ -312,7 +312,7 @@ public class DistributeServiceImpl implements DistributeService {
 					UserPlatSkuDistributeRate dbUserPlatSkuDistributeRate = userPlatSkuDistributeRateMapper.selectOne(Wrappers.lambdaQuery(UserPlatSkuDistributeRate.class).eq(UserPlatSkuDistributeRate::getId, skuRate.getId()).last("limit 1"));
 					userPlatSkuDistributeRateMapper.updateById(skuRate);
 					if (dbUserPlatSkuDistributeRate != null && dbUserPlatSkuDistributeRate.getRate() != skuRate.getRate()) {
-						recordSkuRateChange(userDistribute.getUserId(), goodsDon.getTitle(), skuRate, userDistributeRateChangeRecords);
+						recordSkuRateChange(userDistribute, goodsDon.getTitle(), skuRate, userDistributeRateChangeRecords);
 					}
 					continue;
 				}
@@ -718,10 +718,11 @@ public class DistributeServiceImpl implements DistributeService {
 		}
 	}
 
-	private void recordGoodsRateChange(Long userId, String title, UserPlatDistributeRate rate, List<UserDistributeRateChangeRecord> userDistributeRateChangeRecords) {
+	private void recordGoodsRateChange(UserDistribute userDistribute, String title, UserPlatDistributeRate rate, List<UserDistributeRateChangeRecord> userDistributeRateChangeRecords) {
 		//记录更变记录
 		UserDistributeRateChangeRecord userDistributeRateChangeRecord = new UserDistributeRateChangeRecord();
-		userDistributeRateChangeRecord.setUserId(userId);
+		userDistributeRateChangeRecord.setDistributeId(userDistribute.getId());
+		userDistributeRateChangeRecord.setUserId(userDistribute.getUserId());
 		userDistributeRateChangeRecord.setGoodsId(rate.getGoodsId());
 		String changeInfo = String.format("%s全规格分销比例变为%s%%", title, rate.getRate());
 		userDistributeRateChangeRecord.setChangeInfo(changeInfo);
@@ -729,10 +730,11 @@ public class DistributeServiceImpl implements DistributeService {
 	}
 
 
-	private void recordSkuRateChange(Long userId, String title, UserPlatSkuDistributeRate skuRate, List<UserDistributeRateChangeRecord> userDistributeRateChangeRecords) {
+	private void recordSkuRateChange(UserDistribute userDistribute, String title, UserPlatSkuDistributeRate skuRate, List<UserDistributeRateChangeRecord> userDistributeRateChangeRecords) {
 		//记录更变记录
 		UserDistributeRateChangeRecord userDistributeRateChangeRecord = new UserDistributeRateChangeRecord();
-		userDistributeRateChangeRecord.setUserId(userId);
+		userDistributeRateChangeRecord.setDistributeId(userDistribute.getId());
+		userDistributeRateChangeRecord.setUserId(userDistribute.getUserId());
 		userDistributeRateChangeRecord.setGoodsId(skuRate.getGoodsId());
 		userDistributeRateChangeRecord.setSkuId(skuRate.getSkuId());
 		GoodsDonSku sku = skuMapper.selectById(skuRate.getSkuId());
@@ -745,6 +747,7 @@ public class DistributeServiceImpl implements DistributeService {
 		for (UserPlatSkuDistributeRate userPlatSkuDistributeRate : delSkuRateList) {
 			//记录更变记录
 			UserDistributeRateChangeRecord userDistributeRateChangeRecord = new UserDistributeRateChangeRecord();
+			userDistributeRateChangeRecord.setDistributeId(userDistribute.getId());
 			userDistributeRateChangeRecord.setUserId(userDistribute.getUserId());
 			userDistributeRateChangeRecord.setGoodsId(userPlatSkuDistributeRate.getGoodsId());
 			userDistributeRateChangeRecord.setSkuId(userPlatSkuDistributeRate.getSkuId());
@@ -757,12 +760,13 @@ public class DistributeServiceImpl implements DistributeService {
 		}
 	}
 
-	private void recordGoodsRateSaveChange(Long userId, Long goodsId, Integer goodsRate, String title, List<UserDistributeRateChangeRecord> userDistributeRateChangeRecords) {
+	private void recordGoodsRateSaveChange(UserDistribute userDistribute, Long goodsId, Integer goodsRate, String title, List<UserDistributeRateChangeRecord> userDistributeRateChangeRecords) {
 		BusinessDistributeDefaultRateConfig businessDistributeDefaultRateConfig = businessDistributeDefaultRateConfigMapper.selectOne(Wrappers.lambdaQuery(BusinessDistributeDefaultRateConfig.class).eq(BusinessDistributeDefaultRateConfig::getGoodsId, goodsId).last("limit 1"));
 		if (businessDistributeDefaultRateConfig == null || businessDistributeDefaultRateConfig.getRate() != goodsRate) {
 			//记录更变记录
 			UserDistributeRateChangeRecord userDistributeRateChangeRecord = new UserDistributeRateChangeRecord();
-			userDistributeRateChangeRecord.setUserId(userId);
+			userDistributeRateChangeRecord.setDistributeId(userDistribute.getId());
+			userDistributeRateChangeRecord.setUserId(userDistribute.getUserId());
 			userDistributeRateChangeRecord.setGoodsId(goodsId);
 			String changeInfo = String.format("%s全规格分销比例变为%s%%", title, goodsRate);
 			userDistributeRateChangeRecord.setChangeInfo(changeInfo);
@@ -781,7 +785,7 @@ public class DistributeServiceImpl implements DistributeService {
 					return;
 				}
 			}
-			recordSkuRateChange(userDistribute.getUserId(), title, skuRate, userDistributeRateChangeRecords);
+			recordSkuRateChange(userDistribute, title, skuRate, userDistributeRateChangeRecords);
 		}
 	}
 }

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

@@ -108,7 +108,12 @@ public class CpsDistribtueDataController {
 	 */
 	@GetMapping("/get/rate/record")
 	public Result<SearchResult<UserDistributeRateChangeRecord>> getRateRecord() {
-		SearchResult<UserDistributeRateChangeRecord> search = beanSearcher.search(UserDistributeRateChangeRecord.class, MapUtils.flatBuilder(request.getParameterMap()).onlySelect(UserDistributeRateChangeRecord::getChangeInfo, UserDistributeRateChangeRecord::getCreatedTime).orderBy(UserDistributeRateChangeRecord::getId).desc().build());
+		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());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}