Browse Source

feat:pc首页热门采购单位调整

fuwencai 2 years ago
parent
commit
10cf1673b6
3 changed files with 14 additions and 6 deletions
  1. 11 3
      src/db.json
  2. 1 1
      src/go.mod
  3. 2 2
      src/jfw/front/classificationTag.go

+ 11 - 3
src/db.json

@@ -35,12 +35,12 @@
       "address": "http://192.168.3.241:9205,http://192.168.3.149:9200",
       "address": "http://192.168.3.241:9205,http://192.168.3.149:9200",
       "size": 30,
       "size": 30,
       "version": "v7",
       "version": "v7",
-      "userName":"",
-      "password":""
+      "userName": "",
+      "password": ""
     }
     }
   },
   },
   "redis": {
   "redis": {
-    "main":{
+    "main": {
       "address": "other=192.168.3.149:1712,sso=192.168.3.149:1713,push=192.168.3.149:1711,session=192.168.3.149:1713,recovery=192.168.3.149:1715,merge=192.168.3.206:2711,newother=192.168.3.149:1712,poly=192.168.3.149:1713,seoCache=192.168.3.149:1713,limitation=192.168.3.149:1713"
       "address": "other=192.168.3.149:1712,sso=192.168.3.149:1713,push=192.168.3.149:1711,session=192.168.3.149:1713,recovery=192.168.3.149:1715,merge=192.168.3.206:2711,newother=192.168.3.149:1712,poly=192.168.3.149:1713,seoCache=192.168.3.149:1713,limitation=192.168.3.149:1713"
     },
     },
     "login": {
     "login": {
@@ -63,6 +63,14 @@
       "passWord": "=PDT49#80Z!RVv52_z",
       "passWord": "=PDT49#80Z!RVv52_z",
       "maxOpenConns": 5,
       "maxOpenConns": 5,
       "maxIdleConns": 5
       "maxIdleConns": 5
+    },
+    "globalCommon": {
+      "dBName": "global_common_data",
+      "address": "192.168.3.217:4000",
+      "userName": "root",
+      "passWord": "=PDT49#80Z!RVv52_z",
+      "maxOpenConns": 5,
+      "maxIdleConns": 5
     }
     }
   }
   }
 }
 }

+ 1 - 1
src/go.mod

@@ -6,7 +6,7 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
 	app.yhyue.com/moapp/jybase v0.0.0-20230727083622-4dfc804ea6cf
 	app.yhyue.com/moapp/jybase v0.0.0-20230727083622-4dfc804ea6cf
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20230630032557-eac72f240f41
+	app.yhyue.com/moapp/jypkg latest
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/fsnotify/fsnotify v1.6.0

+ 2 - 2
src/jfw/front/classificationTag.go

@@ -129,8 +129,8 @@ func GetHotCache(redisKey string) (list []*BuyerList, err error) {
 // identityType : 0 采购单位 1-中标单位
 // identityType : 0 采购单位 1-中标单位
 // limit: 数量
 // limit: 数量
 func getEntBaseInfo(identityType, limit int) *[]map[string]interface{} {
 func getEntBaseInfo(identityType, limit int) *[]map[string]interface{} {
-	q := "SELECT  company_id AS id,name FROM   dws_f_ent_baseinfo WHERE     company_id !='' and company_id is not null  AND (identity_type &(1 << ?)) > 0 order by datetime desc  limit ?"
-	return public.BaseMysql.SelectBySql(q, identityType, limit)
+	q := "SELECT  company_id AS id,name FROM   dws_f_ent_baseinfo WHERE     company_id !='' and company_id is not null  AND (identity_type &(1 << ?)) > 0 order by latest_time desc  limit ?"
+	return public.GlobalCommonMysql.SelectBySql(q, identityType, limit)
 
 
 }
 }