Merge branch 'v4.9.6_ws' of https://jygit.jydev.jianyu360.cn/qmx/jy into v4.9.6_ws

src/jfw/front/shorturl.go

@@ -233,7 +233,7 @@ func (s *Short) LoginCommon(sess map[string]interface{}, stype, id string, bm bo
 					_id := encrypt.CommonDecodeArticle(stype, id)[0]
 					_, _, _, obj := pcVRT(_id, "", stype, true, true)
 					if obj != nil && len(obj) > 0 {
-						retMap["_id"] = id
+						retMap["_id"] = url.QueryEscape(id)
 						retMap["title"], _ = obj["title"].(string)
 						retMap["area"], _ = obj["area"].(string)
 						retMap["subtype"], _ = obj["subtype"].(string)

src/jfw/modules/bigmember/src/entity/portrait.go

@@ -238,17 +238,34 @@ func (this *Portrait) GetEntInfo(entId string) (map[string]interface{}, error) {
 		"legal_person":  1, //法人姓名
 		"company_phone": 1, //公司电话
 		"company_name":  1, //公司名称
+		"currency":      1, //注册资本币种
 	})
 	if entinfo == nil || len(*entinfo) == 0 {
 		return nil, errors.New("未查询到企业相关信息")
 	}
+	unit := "万元"
+	if qutil.InterfaceToStr((*entinfo)["currency"]) != "人民币" {
+		unit = fmt.Sprintf("%s%s", "万", qutil.InterfaceToStr((*entinfo)["currency"]))
+	}
+	capital := ""
+	if qutil.Float64All((*entinfo)["capital"]) > 0 {
+		capital = fmt.Sprintf("%d%s", int64(qutil.Float64All((*entinfo)["capital"])), unit)
+	}
+	//switch qutil.InterfaceToStr((*entinfo)["currency"]) {
+	//case "美元":
+	//	unit = "万美元"
+	//case "港币":
+	//	unit = "万港币"
+	//case "澳币":
+	//	unit = "万澳币"
+	//}
 	rData := map[string]interface{}{
 		"type":   (*entinfo)["company_type"],
 		"status": (*entinfo)["company_status"],
 		//"authority":    (*entinfo)["authority"],
 		"creditNo":     (*entinfo)["credit_no"],
 		"taxCode":      (*entinfo)["tax_code"],
-		"capital":      (*entinfo)["capital"],
+		"capital":      capital,
 		"employeeNo":   (*entinfo)["employee_no"],
 		"address":      (*entinfo)["company_address"],
 		"scope":        (*entinfo)["business_scope"],

src/jfw/modules/publicapply/src/detail/config.json

@@ -8,8 +8,8 @@
   ],
   "canReadNotice": 3,
   "contextOldVipLimit": 1664553600,
-  "tokenExpireTime": 3000,
-  "termValidity": 3600,
+  "tokenExpireTime": 10,
+  "termValidity": 4320,
   "bidServices": [
     {
       "tip": "超级订阅、大会员权益",

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

@@ -40,7 +40,7 @@ const (
 	entSearchCacheKey = "entSearchIndexCache_%v"
 
 	index, itype  = "qyxy", "qyxy"
-	entQuery      = `{"query":{"bool":{"must":[%s],"must_not":[%s]}},"_source":["_id","company_name","company_status","legal_person","capital","company_address","company_shortname","company_phone","establish_date","nseo_id"],"sort":[{"capital":{"order":"desc"}}]}`
+	entQuery      = `{"query":{"bool":{"must":[%s],"must_not":[%s]}},"_source":["_id","company_name","company_status","legal_person","capital","company_address","company_shortname","company_phone","establish_date","nseo_id","currency"],"sort":[{"capital":{"order":"desc"}}]}`
 	entQueryCount = `{"query":{"bool":{"must":[%s],"must_not":[%s]}}}`
 )
 
@@ -311,7 +311,16 @@ func formatData(list *[]map[string]interface{}, isFree bool) *[]map[string]inter
 			if establish_date := qutil.Int64All((*list)[index]["establish_date"]); establish_date > 0 {
 				(*list)[index]["establishStamp"] = establish_date
 			}
-
+			//注册资本 币种
+			unit := "万元"
+			if qutil.InterfaceToStr((*list)[index]["currency"]) != "人民币" {
+				unit = fmt.Sprintf("%s%s", "万", qutil.InterfaceToStr((*list)[index]["currency"]))
+			}
+			capital := ""
+			if qutil.Float64All((*list)[index]["capital"]) > 0 {
+				capital = fmt.Sprintf("%d%s", int64(qutil.Float64All((*list)[index]["capital"])), unit)
+			}
+			(*list)[index]["capital"] = capital
 			//清除多余字段
 			for _, key := range delStr {
 				delete((*list)[index], key)