|
@@ -15,9 +15,7 @@ import (
|
|
|
util "jygit.jydev.jianyu360.cn/data_processing/common_utils"
|
|
|
"jygit.jydev.jianyu360.cn/data_processing/common_utils/mongodb"
|
|
|
"jygit.jydev.jianyu360.cn/data_processing/common_utils/udp"
|
|
|
- "log"
|
|
|
"net"
|
|
|
- "reflect"
|
|
|
"regexp"
|
|
|
"strconv"
|
|
|
"strings"
|
|
@@ -45,6 +43,7 @@ var SaveFields = map[string]string{
|
|
|
"discern_attach": "attach_text",
|
|
|
"type": "type", // 消息类型
|
|
|
"recommended_service": "recommended_service", // 供应商推荐服务
|
|
|
+ "deliveryAddress": "deliveryAddress",
|
|
|
//"attch": "",
|
|
|
//"industry": "",
|
|
|
//"contract_overt": "",
|
|
@@ -205,7 +204,7 @@ func AttsMethod(att map[string]interface{}) (*pb.FileResponse, error) {
|
|
|
type DeliveryAddress struct {
|
|
|
Area string `json:"area"`
|
|
|
City string `json:"city"`
|
|
|
- Districts string `json:"districts "`
|
|
|
+ Districts string `json:"districts"`
|
|
|
DetailsAddr string `json:"detailsAddr"`
|
|
|
}
|
|
|
|
|
@@ -217,14 +216,11 @@ func InfoPub(info map[string]interface{}) {
|
|
|
jyMap := make(map[string]interface{})
|
|
|
extractType := 0
|
|
|
for _, f := range InfoFields {
|
|
|
- if f == "deliveryAddress" {
|
|
|
- log.Println(reflect.TypeOf(tmp[f]), "----------deliveryAddress----------", tmp[f])
|
|
|
- }
|
|
|
if tmp[f] == nil || util.ObjToString(tmp[f]) == "" {
|
|
|
continue
|
|
|
}
|
|
|
- switch f {
|
|
|
- case "deliveryAddress":
|
|
|
+ //交付地址
|
|
|
+ if f == "deliveryAddress" {
|
|
|
daStr := util.ObjToString(tmp[f])
|
|
|
var da = DeliveryAddress{}
|
|
|
err := json.Unmarshal([]byte(daStr), &da)
|
|
@@ -234,9 +230,7 @@ func InfoPub(info map[string]interface{}) {
|
|
|
saveMap["deliver_district"] = da.Districts
|
|
|
saveMap["deliver_detail"] = da.DetailsAddr
|
|
|
}
|
|
|
- log.Println("deliveryAddress info :", da, "----deliveryAddress err :", err)
|
|
|
- }
|
|
|
- if f == "budget" || f == "amount" {
|
|
|
+ } else if f == "budget" || f == "amount" {
|
|
|
saveMap[SaveFields[f]] = util.Float64All(tmp[f])
|
|
|
jyMap[f] = util.Float64All(tmp[f])
|
|
|
} else if f == "industry" {
|