wip:交付地点

jy_publishing/tool/task.go

@@ -17,6 +17,7 @@ import (
 	"jygit.jydev.jianyu360.cn/data_processing/common_utils/udp"
 	"log"
 	"net"
+	"reflect"
 	"regexp"
 	"strconv"
 	"strings"
@@ -217,26 +218,23 @@ func InfoPub(info map[string]interface{}) {
 	extractType := 0
 	for _, f := range InfoFields {
 		if f == "deliveryAddress" {
-			log.Println("----------deliveryAddress----------", tmp[f])
+			log.Println(reflect.TypeOf(tmp[f]), "----------deliveryAddress----------", tmp[f])
 		}
-		if tmp[f] == nil {
+		if tmp[f] == nil || util.ObjToString(tmp[f]) == "" {
 			continue
 		}
 		switch f {
 		case "deliveryAddress":
-			b, err := json.Marshal(tmp[f])
-			if err == nil && len(b) > 0 {
-				var da = DeliveryAddress{}
-				err = json.Unmarshal(b, &da)
-				if err == nil && da.Area != "" {
-					saveMap["deliver_area"] = da.Area
-					saveMap["deliver_city"] = da.City
-					saveMap["deliver_district"] = da.Districts
-					saveMap["deliver_detail"] = da.DetailsAddr
-				}
-				log.Println("deliveryAddress  info :", da)
+			daStr := util.ObjToString(tmp[f])
+			var da = DeliveryAddress{}
+			err := json.Unmarshal([]byte(daStr), &da)
+			if err == nil && da.Area != "" {
+				saveMap["deliver_area"] = da.Area
+				saveMap["deliver_city"] = da.City
+				saveMap["deliver_district"] = da.Districts
+				saveMap["deliver_detail"] = da.DetailsAddr
 			}
-			log.Println("deliveryAddress  err :", err)
+			log.Println("deliveryAddress  info :", da, "----deliveryAddress  err :", err)
 		}
 		if f == "budget" || f == "amount" {
 			saveMap[SaveFields[f]] = util.Float64All(tmp[f])