Merge branch 'developer' of…

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

gic-data-cloud-service/src/main/resources/mapper/TabIndexDescMapper.xml

@@ -150,7 +150,9 @@
     where t1.status = 1
     and t2.enterprise_id = #{enterpriseId}
     and t1.module_id = #{moduleId}
-    and t1.index_group_name = #{indexGroupName}
+    <if test="indexGroupName != null and indexGroupName != '' ">
+      and t1.index_group_name = #{indexGroupName}
+    </if>
     and t2.index_status = 1
     order by t2.sort
   </select>
@@ -169,7 +171,9 @@
     where t1.status = 1
     and t2.enterprise_id = #{enterpriseId}
     and t1.module_id = #{moduleId}
-    and t1.index_group_name = #{indexGroupName}
+    <if test="indexGroupName != null and indexGroupName != '' ">
+      and t1.index_group_name = #{indexGroupName}
+    </if>
     and t2.index_status = 1
     and (t3.status = 1 or t3.status is null)
     and (t3.classify_type = 1 or t3.classify_type is null)
@@ -190,7 +194,9 @@
     where t1.status = 1
     and t2.enterprise_id = #{enterpriseId}
     and t1.module_id = #{moduleId}
-    and t1.index_group_name = #{indexGroupName}
+    <if test="indexGroupName != null and indexGroupName != '' ">
+      and t1.index_group_name = #{indexGroupName}
+    </if>
     and t2.index_status = 0
   </select>
 </mapper>
\ No newline at end of file

gic-data-cloud-service/src/main/resources/mapper/TabIndexMapper.xml

@@ -352,9 +352,6 @@
     <if test="code != null and code != '' ">
       and code = #{code}
     </if>
-    <if test="moduleId != null and moduleId != '' ">
-        and module_id = #{moduleId}
-    </if>
     <if test="indexId != null ">
         and index_id &lt;&gt; #{indexId}
     </if>

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/ConsumeStructureController.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.consumestructure.AgeConsumeShareQO;
+import com.gic.data.api.service.consumestructure.ConsumeStructureApiService;
+import com.gic.enterprise.utils.ResultControllerUtils;
+
+@RestController
+public class ConsumeStructureController {
+    private static final Logger log = LogManager.getLogger(ConsumeStructureController.class);
+    @Autowired
+    private ConsumeStructureApiService consumeStructureApiService;
+    @Autowired
+    private StoreSearchUtils storeSearchUtils;
+
+    /**
+     * 年龄消费占比（订单人数/订单数/销售额）
+     * @Title: queryAgeConsumeShare

+     * @Description:
+    
* @author guojuxing
+     * @param params

+     * @return  com.gic.commons.webapi.reponse.RestResponse

+    
*/
+    @RequestMapping("get-age-consume-share")
+    public RestResponse queryAgeConsumeShare(AgeConsumeShareQO 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(consumeStructureApiService.queryAgeConsumeShare(params));
+    }
+
+    @RequestMapping("get-age-consume-survey")
+    public RestResponse queryAgeConsumeSurvey(AgeConsumeShareQO 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(consumeStructureApiService.queryAgeConsumeSurvey(params));
+    }
+}

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

@@ -149,4 +149,5 @@
     <dubbo:reference interface="com.gic.cloud.service.FunctionApiService" id="functionApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.cloud.service.FunctionModuleApiService" id="functionModuleApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.data.api.service.performanceoverview.PerformanceOverviewApiService" id="performanceOverviewApiService" timeout="6000" retries="0"/>
+    <dubbo:reference interface="com.gic.data.api.service.consumestructure.ConsumeStructureApiService" id="consumeStructureApiService" timeout="6000" retries="0"/>
 </beans>