fix

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

@@ -14,6 +14,8 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 public class UserDistributeEquipment extends BaseEntity{
+	private Long DistributeId;
+
 	private Long userId;
 
 	/**

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

@@ -1,6 +1,6 @@
 package com.cyksj.model.views;
 
-import com.cyksj.model.entity.CouponDistributePopularize;
+import com.cyksj.model.entity.UserDistributeEquipment;
 import com.cyksj.model.entity.UserDistributeTargetAlert;
 import lombok.Getter;
 import lombok.Setter;
@@ -29,4 +29,10 @@ public class UserDistributeRateDetailView {
 	 * 渠道目标额
 	 */
 	private List<UserDistributeTargetAlert> targets;
+
+
+	/**
+	 * 设备分销
+	 */
+	private UserDistributeEquipment epRate;
 }

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

@@ -155,7 +155,7 @@ public class DistributeServiceImpl implements DistributeService {
 		handlerDistributeTargetAlert(userDistribute.getId(), targets);
 
 		//设备分销
-		handlerSpecialEquipmentRate(userDistributeReq.getEpRate(), userDistribute.getUserId());
+		handlerSpecialEquipmentRate(userDistributeReq.getEpRate(), userDistribute);
 	}
 
 	@Override
@@ -500,10 +500,13 @@ public class DistributeServiceImpl implements DistributeService {
 	/**
 	 * 设备分销
 	 */
-	private void handlerSpecialEquipmentRate(UserDistributeEquipment epRate, Long userId) {
+	private void handlerSpecialEquipmentRate(UserDistributeEquipment epRate, UserDistribute userDistribute) {
 		BigDecimal zero = BigDecimal.ZERO;
+		Long userId = userDistribute.getUserId();
+		Long distributeId = userDistribute.getId();
 		if (epRate != null) {
 			epRate.setUserId(userId);
+			epRate.setDistributeId(distributeId);
 			BigDecimal ep = epRate.getEp();
 			BigDecimal acTv = epRate.getAcTv();
 			BigDecimal combo = epRate.getCombo();

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

@@ -21,6 +21,7 @@ import com.cyksj.mapper.*;
 import com.cyksj.mapper.manage.cms.CmsUserMapper;
 import com.cyksj.mapper.manage.coupon.CouponDistributePopularizeMapper;
 import com.cyksj.mapper.manage.distribute.*;
+import com.cyksj.mapper.manage.distribute.equipment.UserDistributeEquipmentMapper;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.request.BusinessDistributeDefaultRateDetailReq;
 import com.cyksj.model.request.DistributeApplyMoneyReq;
@@ -119,6 +120,8 @@ public class DistributeController {
 
 	private final UserDistributeSharedWhiteMapper userDistributeSharedWhiteMapper;
 
+	private final UserDistributeEquipmentMapper userDistributeEquipmentMapper;
+
 	/**
 	 * 添加固定推广者
 	 */
@@ -195,6 +198,8 @@ public class DistributeController {
 		List<UserDistributeTargetAlert> targets = targetAlertMapper.selectList(Wrappers.lambdaQuery(UserDistributeTargetAlert.class)
 				.eq(UserDistributeTargetAlert::getDistributeId, id));
 		rateDetailView.setTargets(targets);
+		rateDetailView.setEpRate(userDistributeEquipmentMapper.selectOne(Wrappers.lambdaQuery(UserDistributeEquipment.class)
+				.eq(UserDistributeEquipment::getDistributeId, id).last("limit 1")));
 		return GatewayResponse.SUCCESS.newBuilder().toResult(rateDetailView);
 	}