|
|
@@ -49,9 +49,16 @@ func buyerStandarData(db string, query map[string]interface{}) {
|
|
|
ps = append(ps, v)
|
|
|
data := comHisMegerNewData(buyer, "buyer", ps)
|
|
|
if data != nil {
|
|
|
- province := qu.ObjToString(data["province"])
|
|
|
- if province == "" { //省份为空，根据buyer提取区域信息
|
|
|
- province, city, district := GetProvinceCityDistrict([]string{buyer})
|
|
|
+ province, city, district := "", "", ""
|
|
|
+ province = qu.ObjToString(data["province"])
|
|
|
+ if province == "" { //省份为空，company_address优先提取区域信息再buyer
|
|
|
+ company_address := qu.ObjToString(data["company_address"])
|
|
|
+ if company_address != "" {
|
|
|
+ province, city, district = GetProvinceCityDistrict([]string{company_address})
|
|
|
+ }
|
|
|
+ if province == "" {
|
|
|
+ province, city, district = GetProvinceCityDistrict([]string{buyer})
|
|
|
+ }
|
|
|
data["province"] = province
|
|
|
data["city"] = city
|
|
|
data["district"] = district
|
