合并代码解决冲突

src/jfw/modules/publicapply/src/enterpriseSearch/entity/entQuery.go

@@ -30,7 +30,7 @@ type EnterpriseSearch struct {
 
 const (
 	searchMaxLimit    = 100 //最大查询数量限制
-	freeSearchNum     = 5   //免费查询数量限制
+	freeSearchNum     = 4   //免费查询数量限制
 	entSearchCacheDB  = "other"
 	entSearchCacheKey = "entSearchIndexCache"
 

src/jfw/modules/subscribepay/src/service/dataExportPay.go

@@ -250,7 +250,7 @@ func (this *DataExportPay) VipDailyDataExport() {
 		if vipStatus.Status <= 0 || vipStatus.DailyNum == 0 {
 			return nil, fmt.Errorf("非法请求")
 		}
-		selectCount := entity.GetDataExportSearchCountUseId(selectId)
+		selectCount := dataexport.GetDataExportSearchCountByScdId(util.MQFW, config.Config.Elasticsearch, selectId)
 		if selectCount > config.ExConf.MsgMaxCount {
 			selectCount = config.ExConf.MsgMaxCount
 		} else if selectCount == 0 {
@@ -264,7 +264,7 @@ func (this *DataExportPay) VipDailyDataExport() {
 		}
 		//生成excel文件&存储导出记录
 		go func() {
-			list, err := entity.GetDataExportSearchResult(selectId, "2", selectCount)
+			list, err := dataexport.GetDataExportSearchResultByScdId(util.MQFW, config.Config.Elasticsearch, selectId, "2", selectCount)
 			url := util.GetExcelFilePath(pay.GetOrderCode(selectId))
 			if err == nil {
 				log.Println("开始创建excel")