Merge branch 'bugfix-2024-04-beiga' into 'master'

销售接口调整：如果没有传渠道数据，则查询全渠道

See merge request !1693

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/DataController.java

@@ -41,6 +41,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 数据调用通用接口
@@ -64,6 +65,10 @@ public class DataController {
     @Autowired
     private ClerkService clerkService;
 
+    List<String> needSelectAllInterface = Stream.of("data_sales_perf_anal_cont_custm_overview", "data_sales_perf_anal_cont_custm_std_overview",
+            "data_sales_perf_anal_cont_day_overview", "data_sales_perf_anal_cont_month_overview",
+            "data_sales_perf_anal_cont_week_overview", "data_sales_perf_anal_cont_year_overview").collect(Collectors.toList());
+
     private String isProd() {
         Config config = ConfigService.getConfig("COMMON.gic-properties");
         String env = config.getProperty("environment.value", "") ;
@@ -340,6 +345,12 @@ public class DataController {
         }
         String apolloKey = qo.getApolloKey();
 
+        if (needSelectAllInterface.contains(apolloKey)) {
+            if (StringUtils.isBlank(jsonObject.getString("orderChannel"))) {
+                jsonObject.put("orderChannel", "c_all");
+            }
+        }
+
         boolean notNeedStoreIdParam = "data_store_rank_index_info".equals(apolloKey);
         if (notNeedStoreIdParam && !hasStoreId) {
             jsonObject.remove("storeId");