fix

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

@@ -18,6 +18,7 @@ import com.cyksj.mapper.GoodsDonMapper;
 import com.cyksj.mapper.GoodsDonSkuMapper;
 import com.cyksj.mapper.UserDistributePosterRecordMapper;
 import com.cyksj.mapper.manage.coupon.CouponDistributePopularizeMapper;
+import com.cyksj.mapper.manage.cps.UserDistributePopularizeMapper;
 import com.cyksj.mapper.manage.distribute.*;
 import com.cyksj.mapper.sys.SysConfigMapper;
 import com.cyksj.model.entity.*;
@@ -93,6 +94,8 @@ public class CpsPopularizeController {
 
 	private final SysConfigMapper sysConfigMapper;
 
+	private final UserDistributePopularizeMapper userDistributePopularizeMapper;
+
 	/**
 	 * 渠道推广链接列表
 	 */
@@ -204,25 +207,31 @@ public class CpsPopularizeController {
 	 * id 推广链接id
 	 * cps链接数据详情
 	 */
-	@GetMapping("/get/popularizeUrl/data/{id}")
-	public Result<UserDistributePopularizeView> getPopularizeUrlData(@PathVariable Long id, String startTime, String endTime) {
+	@GetMapping("/get/popularizeUrl/data")
+	public Result<SearchResult<UserDistributePopularizeView>> getPopularizeUrlData(Long id, String startTime, String endTime) {
 		long cpsUserId = StpCpsManageUser.getLoginIdAsLong();
-		UserDistributePopularizeView data = cpsPopularizeService.getPopularizeUrlData(cpsUserId, id, startTime, endTime);
-		data.setRate(null);
-		//点击数
-		data.setClickNum(distributePopularizeClickRecordMapper.selectCount(Wrappers.lambdaQuery(DistributePopularizeClickRecord.class)
-				.eq(DistributePopularizeClickRecord::getPopularizeId, id)
-				.ge(startTime != null, DistributePopularizeClickRecord::getCreatedTime, startTime)
-				.lt(endTime != null, DistributePopularizeClickRecord::getCreatedTime, endTime)));
-		//会员订单数据
-		if (data.getGoodsId() != null && data.getGoodsId() == Constant.VIP_RELATE_GOODS_ID) {
-			UserDistributePopularizeView vipOrderView =cpsPopularizeService.getVipPopularizeDetail(data.getId(), startTime, endTime);
-			data.setOrders(data.getOrders() + vipOrderView.getOrders());
-			data.setOrdersMoney(data.getOrdersMoney().add(vipOrderView.getOrdersMoney()));
-			data.setWMoney(data.getWMoney().add(vipOrderView.getWMoney()));
-			data.setGotMoney(data.getGotMoney().add(vipOrderView.getGotMoney()));
-		}
-		return GatewayResponse.SUCCESS.newBuilder().toResult(data);
+		SearchResult<UserDistributePopularizeView> search = beanSearcher.search(UserDistributePopularizeView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+		search.getDataList().forEach(data->{
+			UserDistributePopularizeView pData = cpsPopularizeService.getPopularizeUrlData(cpsUserId, id, startTime, endTime);
+			data.setOrders(pData.getOrders());
+			data.setOrdersMoney(pData.getOrdersMoney());
+			data.setWMoney(pData.getWMoney());
+			data.setGotMoney(pData.getGotMoney());
+			//点击数
+			data.setClickNum(distributePopularizeClickRecordMapper.selectCount(Wrappers.lambdaQuery(DistributePopularizeClickRecord.class)
+					.eq(DistributePopularizeClickRecord::getPopularizeId, id)
+					.ge(startTime != null, DistributePopularizeClickRecord::getCreatedTime, startTime)
+					.lt(endTime != null, DistributePopularizeClickRecord::getCreatedTime, endTime)));
+			//会员订单数据
+			if (data.getGoodsId() != null && data.getGoodsId() == Constant.VIP_RELATE_GOODS_ID) {
+				UserDistributePopularizeView vipOrderView =cpsPopularizeService.getVipPopularizeDetail(data.getId(), startTime, endTime);
+				data.setOrders(data.getOrders() + vipOrderView.getOrders());
+				data.setOrdersMoney(data.getOrdersMoney().add(vipOrderView.getOrdersMoney()));
+				data.setWMoney(data.getWMoney().add(vipOrderView.getWMoney()));
+				data.setGotMoney(data.getGotMoney().add(vipOrderView.getGotMoney()));
+			}
+		});
+		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}
 
 	/**