Merge branch '20250613-wyp-fix' of Server/growth-manager into master

api-module/src/main/java/com/tzld/piaoquan/api/model/vo/contentplatform/QwSubChannelDatastatItemExportVO.java

@@ -27,10 +27,10 @@ public class QwSubChannelDatastatItemExportVO {
 
     @ExcelProperty("本渠道裂变率")
     private Double score;
-
-    @ExcelProperty(value = "预估单价")
-    private Double unitPrice;
-
-    @ExcelProperty(value = "建议结算金额")
-    private Double settlementAmount;
+//
+//    @ExcelProperty(value = "预估单价")
+//    private Double unitPrice;
+//
+//    @ExcelProperty(value = "建议结算金额")
+//    private Double settlementAmount;
 }

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformDatastatServiceImpl.java

@@ -293,8 +293,8 @@ public class ContentPlatformDatastatServiceImpl implements ContentPlatformDatast
             vo.setSubChannel(datastat.getSubChannel());
             vo.setFirstLevel(datastat.getFirstLevelCount());
             vo.setScore(datastat.getScore());
-            vo.setUnitPrice(datastat.getUnitPrice());
-            vo.setSettlementAmount(datastat.getSettlementAmount());
+//            vo.setUnitPrice(datastat.getUnitPrice());
+//            vo.setSettlementAmount(datastat.getSettlementAmount());
             return vo;
         }).collect(Collectors.toList());
         result.setObjs(list);
@@ -441,8 +441,10 @@ public class ContentPlatformDatastatServiceImpl implements ContentPlatformDatast
         ArrayList<QwSubChannelDatastatItemExportVO> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(dataList)) {
             for (QwDatastatItemVO data : dataList) {
+//                list.add(new QwSubChannelDatastatItemExportVO(data.getDateStr(), data.getSubChannel(),
+//                        data.getFirstLevel(), data.getScore(), data.getUnitPrice(), data.getSettlementAmount()));
                 list.add(new QwSubChannelDatastatItemExportVO(data.getDateStr(), data.getSubChannel(),
-                        data.getFirstLevel(), data.getScore(), data.getUnitPrice(), data.getSettlementAmount()));
+                        data.getFirstLevel(), data.getScore()));
             }
         } else {
             list.add(new QwSubChannelDatastatItemExportVO());