Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer

 Conflicts:
	gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/IndexController.java

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/PerformanceOverviewController.java

+package com.gic.cloud.web.controller;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.data.api.qo.performanceoverview.PerformanceOverviewQO;
+import com.gic.data.api.service.performanceoverview.PerformanceOverviewApiService;
+import com.gic.enterprise.utils.ResultControllerUtils;
+
+@RestController
+public class PerformanceOverviewController {
+    private static final Logger log = LogManager.getLogger(PerformanceOverviewController.class);
+    @Autowired
+    private PerformanceOverviewApiService performanceOverviewApiService;
+    @Autowired
+    private StoreSearchUtils storeSearchUtils;
+
+    @RequestMapping("get-performance-overview")
+    public RestResponse selectPerformanceOverview(PerformanceOverviewQO params) {
+        log.info("业绩概览参数：{}", JSON.toJSONString(params));
+        params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
+        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
+        return ResultControllerUtils.commonResult(performanceOverviewApiService.selectPerformanceOverview(params));
+    }
+}

gic-data-cloud-wxapp/src/main/resources/dubbo-gic-data-cloud-wxapp.xml

@@ -146,4 +146,6 @@
     <dubbo:reference interface="com.gic.cloud.service.IndexDescApiService" id="indexDescApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.cloud.service.DataExplainApiService" id="dataExplainApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.data.api.service.IndexSalesApiService" id="indexSalesApiService" timeout="6000" retries="0"/>
+
+    <dubbo:reference interface="com.gic.data.api.service.performanceoverview.PerformanceOverviewApiService" id="performanceOverviewApiService" timeout="6000" retries="0"/>
 </beans>