fix

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

@@ -60,5 +60,17 @@ public class DistributePosterGoodsCpsView {
 	private Long rid;
 
 	@DbIgnore
-	private UserDistributePosterOrderDetailView userDistributePosterOrderDetailView;
+	private Integer clickNum = 0;
+
+	@DbIgnore
+	private Integer orders;
+
+	@DbIgnore
+	private BigDecimal ordersMoney;
+
+	@DbIgnore
+	private BigDecimal wMoney;
+
+	@DbIgnore
+	private BigDecimal gotMoney;
 }

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

@@ -42,6 +42,18 @@ public class UserDistributePopularizeView {
 	@DbIgnore
 	private String logo;
 
+	/**
+	 * 最低价格
+	 */
+	@DbIgnore
+	private BigDecimal price;
+
+	/**
+	 * 分销比例
+	 */
+	@DbIgnore
+	private Integer rate = 0;
+
 	@DbIgnore
 	private Integer clickNum = 0;
 

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

@@ -1,7 +1,6 @@
 package com.cyksj.model.views;
 
 import com.ejlchina.searcher.bean.DbField;
-import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
@@ -25,9 +24,6 @@ public class UserDistributePosterOrderDetailView {
 	@DbField("dp.id")
 	private Long id;
 
-	@DbIgnore
-	private Integer clickNum;
-
 	@DbField("count(if(dsp.id is NULL,NULL,1))")
 	private Integer orders;
 

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

@@ -91,12 +91,38 @@ public class CpsPopularizeController {
 		if (StrUtil.isNotBlank(time)) {
 			builder.put("time", time);
 		}
+		UserDistribute userDistribute = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class)
+				.eq(UserDistribute::getUserId, cpsUserId)
+				.eq(UserDistribute::getDeleted, 1)
+				.last("limit 1"));
 		SearchResult<UserDistributePopularizeView> search = beanSearcher.search(UserDistributePopularizeView.class, builder.build());
 		search.getDataList().forEach(data -> {
 			data.setPopularizeLink(String.format(envCommonService.DISTRIBUTE_DEFAULT_URL_PREFIX, data.getCode()));
 			Optional.ofNullable(goodsDonMapper.selectById(data.getGoodsId())).ifPresent(goods -> {
 				data.setTitle(goods.getTitle());
 				data.setLogo(goods.getLogo());
+				data.setPrice(goods.getMinPrice());
+				if (goods.getIsSkuDistribute()) {
+					UserPlatSkuDistributeRate userPlatSkuDistributeRate = userPlatSkuDistributeRateMapper.selectOne(Wrappers.lambdaQuery(UserPlatSkuDistributeRate.class)
+							.eq(UserPlatSkuDistributeRate::getDistributeId, userDistribute.getId())
+							.eq(UserPlatSkuDistributeRate::getGoodsId, data.getGoodsId())
+							.ne(UserPlatSkuDistributeRate::getRate, 0)
+							//上架
+							.apply("exists (select 1 from goods_don_sku sku where sku.id = sku_id and sku.status is true limit 1)")
+							.orderByAsc(UserPlatSkuDistributeRate::getRate)
+							.last("limit 1"));
+					if (userPlatSkuDistributeRate != null) {
+						data.setRate(userPlatSkuDistributeRate.getRate());
+					}
+				} else {
+					UserPlatDistributeRate userPlatDistributeRate = userPlatDistributeRateMapper.selectOne(Wrappers.lambdaQuery(UserPlatDistributeRate.class)
+							.eq(UserPlatDistributeRate::getDistributeId, userDistribute.getId())
+							.eq(UserPlatDistributeRate::getGoodsId, data.getGoodsId())
+							.last("limit 1"));
+					if (userPlatDistributeRate != null) {
+						data.setRate(userPlatDistributeRate.getRate());
+					}
+				}
 			});
 			data.setClickNum(distributePopularizeClickRecordMapper.selectCount(Wrappers.lambdaQuery(DistributePopularizeClickRecord.class).eq(DistributePopularizeClickRecord::getPopularizeId, data.getId())));
 		});
@@ -289,10 +315,13 @@ public class CpsPopularizeController {
 			}
 			UserDistributePosterOrderDetailView distributePosterOrderDetailView = beanSearcher.searchFirst(UserDistributePosterOrderDetailView.class, posterOrderBuilder.put("condition", String.format(String.format(" where user_id = %s and poster_id = %s", cpsUserId, e.getId()))).build());
 			if (distributePosterOrderDetailView != null) {
-				distributePosterOrderDetailView.setClickNum(distributePopularizeClickRecordMapper.selectCount(Wrappers.lambdaQuery(DistributePopularizeClickRecord.class)
+				e.setOrdersMoney(distributePosterOrderDetailView.getOrdersMoney());
+				e.setOrders(distributePosterOrderDetailView.getOrders());
+				e.setWMoney(distributePosterOrderDetailView.getWMoney());
+				e.setGotMoney(distributePosterOrderDetailView.getGotMoney());
+				e.setClickNum(distributePopularizeClickRecordMapper.selectCount(Wrappers.lambdaQuery(DistributePopularizeClickRecord.class)
 						.eq(DistributePopularizeClickRecord::getRid, distributePosterOrderDetailView.getId())));
 			}
-			e.setUserDistributePosterOrderDetailView(distributePosterOrderDetailView);
 
 			UserDistributePosterRecord distributePosterRecord = userDistributePosterRecordMapper.selectOne(Wrappers.lambdaQuery(UserDistributePosterRecord.class)
 					.eq(UserDistributePosterRecord::getPosterId, e.getId())