Преглед на файлове

Merge branch 'dev4.6.3.13' into release

luwenna преди 3 години
родител
ревизия
e4b00ed524
променени са 2 файла, в които са добавени 3 реда и са изтрити 4 реда
  1. 2 3
      README.md
  2. 1 1
      src/jfw/modules/bigmember/src/entity/marketAnalysis/customized_analysis.go

+ 2 - 3
README.md

@@ -2,6 +2,5 @@
 微信和pc端功能
 weixin sdk https://github.com/wizjin/weixin
 web用xweb框架
-v4.6.3.8
-1、支持控制开发票功能能用/不能用
-2、开发票回显
+v4.6.3.13
+定制化报告地区分布超过10个,只返回了前10个地区

+ 1 - 1
src/jfw/modules/bigmember/src/entity/marketAnalysis/customized_analysis.go

@@ -11,7 +11,7 @@ import (
 
 const (
 	query_aggs_sortprice       = `"sortprice_ranges": {"range":{"field":"sortprice","ranges":[%s]},"aggs":{"sum_sortprice":{"sum":{"field":"sortprice"}}}}`
-	aggs_area                  = `"area_distribution": {"terms": {"field": "area"},"aggs": {"area_amount": {"sum": {"field": "sortprice"}},"area_total": {"filter": {}}}}`
+	aggs_area                  = `"area_distribution": {"terms": {"field": "area","size": 40},"aggs": {"area_amount": {"sum": {"field": "sortprice"}},"area_total": {"filter": {}}}}`
 	query_top10                = `,"sort": [{"sortprice": "desc"}],"from": 0,"size": 10`
 	aggs_area_amounttop3       = `"area_amount_top3":{"terms":{"field":"area","exclude":["全国"],"order":[{"area_amount":"desc"}],"size":3},"aggs":{"area_amount":{"sum":{"field":"sortprice"}},"winner_top":{"terms":{"field":"entidlist","exclude": ["-"],"order":[{"area_winner_amount":"desc"}],"size":3},"aggs":{"area_winner_amount":{"sum":{"field":"sortprice"}}}}}}`
 	aggs_area_counttop3        = `"area_count_top3":{"terms":{"field":"area","exclude":["全国"],"order":[{"area_count":"desc"}],"size":3},"aggs":{"area_count":{"filter":{}},"winner_top":{"terms":{"field":"entidlist","exclude": ["-"],"order":[{"area_winner_count":"desc"}],"size":3},"aggs":{"area_winner_count":{"filter":{}}}}}}`