This commit is contained in:
邹宗楠
2023-09-20 13:54:02 +08:00
parent 28ce18262c
commit 1aea329401
3 changed files with 48 additions and 20 deletions

View File

@@ -175,7 +175,19 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
storeParams.StationName = utils.LimitUTF8StringLen(storeParams.StationName, jdapi.MaxStoreNameLen)
}
if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 {
storeParams.StationAddress = store.Address
storeDetail, _ := dao.GetStoreDetail(db, storeID, model.VendorIDJD, "")
address := ""
if !strings.Contains(store.Address, "省") && model.ZXCityCodeMap[store.CityCode] != "" {
address += storeDetail.ProvinceName
}
if !strings.Contains(storeDetail.Address, "市") {
address += storeDetail.CityName
}
if !strings.Contains(storeDetail.Address, "县") || !strings.Contains(storeDetail.Address, "区") {
address += storeDetail.DistrictName
}
storeParams.StationAddress = address + storeDetail.Address
storeParams.CoordinateType = jdapi.CoordinateTypeAutonavi // 一直用高德
storeParams.Lng = jxutils.IntCoordinate2Standard(store.Lng)
storeParams.Lat = jxutils.IntCoordinate2Standard(store.Lat)
@@ -576,6 +588,18 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
if createParams.County == 310045 {
createParams.City = 49318
}
address := ""
if !strings.Contains(storeDetail.Address, "省") && model.ZXCityCodeMap[storeDetail.CityCode] != "" {
address += storeDetail.ProvinceName
}
if !strings.Contains(storeDetail.Address, "市") {
address += storeDetail.CityName
}
if !strings.Contains(storeDetail.Address, "县") || !strings.Contains(storeDetail.Address, "区") {
address += storeDetail.DistrictName
}
createParams.StationAddress = address + storeDetail.Address
result, err := getAPI(vendorOrgCode).CreateStore(createParams)
if err != nil {
return "", err