fix cps后台规格分销展示

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

@@ -41,4 +41,9 @@ public class CpsUserDistributeDetailView {
 	 * 各平台分销比例
 	 */
 	private Map<String, List<UserDistributeRateView>> rateViews;
+
+	/**
+	 * 规格分销比例
+	 */
+	List<UserSkuDistributeView> skuRates;
 }

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

@@ -3,19 +3,18 @@ package com.cyksj.web.controller.cps;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.GoodsDonMapper;
 import com.cyksj.mapper.manage.distribute.UserDistributeMapper;
-import com.cyksj.model.entity.DistributeMoneyApply;
-import com.cyksj.model.entity.DistributeWaitingSendPoints;
-import com.cyksj.model.entity.GoodsDon;
-import com.cyksj.model.entity.User;
+import com.cyksj.model.entity.*;
 import com.cyksj.model.views.*;
 import com.cyksj.service.cps.CpsManageService;
 import com.cyksj.web.util.StpCpsManageUser;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
@@ -68,6 +67,10 @@ public class CpsDistribtueDataController {
 				.field(DistributeMoneyApply::getVerifyStatus, DistributeMoneyApply.Status.success.name())
 				.field(DistributeMoneyApply::getMType, DistributeMoneyApply.MType.ds.name())
 				.build(), "money");
+		UserDistribute userDistribute = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class)
+				.eq(UserDistribute::getUserId, cpsUserId)
+				.eq(UserDistribute::getDeleted, 1)
+				.last("limit 1"));
 		Number reMoneyPoints = beanSearcher.searchSum(DistributeWaitingSendPoints.class, MapUtils.builder().field(DistributeWaitingSendPoints::getSharedId, cpsUserId).field(DistributeWaitingSendPoints::getSendStatus, DistributeWaitingSendPoints.Status.success.name()).build(), "points");
 		Number wMoneyPoints = beanSearcher.searchSum(DistributeWaitingSendPoints.class, MapUtils.builder().field(DistributeWaitingSendPoints::getSharedId, cpsUserId).field(DistributeWaitingSendPoints::getSendStatus, DistributeWaitingSendPoints.Status.waiting.name()).build(), "points");
 		List<UserDistributeRateView> rateViews = beanSearcher.searchAll(UserDistributeRateView.class, MapUtils.builder()
@@ -76,6 +79,15 @@ public class CpsDistribtueDataController {
 				.build());
 		CpsUserDistributeDetailView detailView = new CpsUserDistributeDetailView();
 		Map<String, List<UserDistributeRateView>> collect = rateViews.stream().filter(ct -> StrUtil.isNotBlank(ct.getCategoryName())).collect(Collectors.groupingBy(UserDistributeRateView::getCategoryName));
+
+		List<UserSkuDistributeView> skuRates = beanSearcher.searchAll(UserSkuDistributeView.class, MapUtils.builder()
+				.put("dis_id", String.format(" and up.distribute_id = %s", userDistribute.getId()))
+				.field(UserSkuDistributeView::getRate).op(Operator.NotNull)
+				.orderBy(UserSkuDistributeView::getGoodsId).asc()
+				.build());
+		//规格分销
+		detailView.setSkuRates(skuRates);
+
 		detailView.setRateViews(collect);
 		detailView.setWMoney(BigDecimal.valueOf(wMoneyPoints.doubleValue()).divide(thresholdPoints, 2, RoundingMode.DOWN));
 		detailView.setReMoney(BigDecimal.valueOf(reMoneyPoints.doubleValue()).divide(thresholdPoints, 2, RoundingMode.DOWN));