liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

别邮箱

Browse Source
This commit is contained in:
苏尹岚
2020-09-29 14:33:22 +08:00
parent d0051fe9bf
commit b6dcf8574d
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
business/jxstore/cms/store.go
View File

@@ -3700,17 +3700,11 @@ func GetDiffJxStoreAndMTWMStoreInfo(ctx *jxcontext.Context, storeIDs []int) (err
) )
courierStoreList, _ := dao.GetStoreCourierList(db, storeIDs, []int{model.VendorIDMTPS}, model.StoreStatusAll, model.StoreAuditStatusAll) courierStoreList, _ := dao.GetStoreCourierList(db, storeIDs, []int{model.VendorIDMTPS}, model.StoreStatusAll, model.StoreAuditStatusAll)
for _, v := range courierStoreList { for _, v := range courierStoreList {
comment := ""
tmpDiffStore := &TmpDiffStore{ tmpDiffStore := &TmpDiffStore{
StoreID: v.StoreID, StoreID: v.StoreID,
} }
shopInfo, _ := api.MtpsAPI.ShopQuery(utils.Int2Str(v.StoreID)) stores, err := dao.GetStoreList(db, []int{v.StoreID}, nil, nil, nil, "")
if shopInfo == nil {
continue
}
stores, _ := dao.GetStoreList(db, []int{v.StoreID}, nil, nil, nil, "")
if len(stores) == 0 {
continue
}
store := stores[0] store := stores[0]
place, _ := dao.GetPlaceByCode(db, store.CityCode) place, _ := dao.GetPlaceByCode(db, store.CityCode)
tmpDiffStore.City = place.Name tmpDiffStore.City = place.Name
@@ -3718,10 +3712,15 @@ func GetDiffJxStoreAndMTWMStoreInfo(ctx *jxcontext.Context, storeIDs []int) (err
tmpDiffStore.Coordinate = utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng)) + "," + utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lat)) tmpDiffStore.Coordinate = utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng)) + "," + utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lat))
tmpDiffStore.Address = store.Address tmpDiffStore.Address = store.Address
tmpDiffStore.Phone = store.Tel1 tmpDiffStore.Phone = store.Tel1
shopInfo, err := api.MtpsAPI.ShopQuery(utils.Int2Str(v.StoreID))
if err != nil {
tmpDiffStore.Comment += err.Error()
tmpDiffStoreList = append(tmpDiffStoreList, tmpDiffStore)
continue
}
tmpDiffStore.CoordinateMT = utils.Float64ToStr(jxutils.IntCoordinate2Standard(shopInfo.ShopLng)) + "," + utils.Float64ToStr(jxutils.IntCoordinate2Standard(shopInfo.ShopLat)) tmpDiffStore.CoordinateMT = utils.Float64ToStr(jxutils.IntCoordinate2Standard(shopInfo.ShopLng)) + "," + utils.Float64ToStr(jxutils.IntCoordinate2Standard(shopInfo.ShopLat))
tmpDiffStore.AddressMT = shopInfo.ShopAddress tmpDiffStore.AddressMT = shopInfo.ShopAddress
tmpDiffStore.PhoneMT = shopInfo.ContactPhone tmpDiffStore.PhoneMT = shopInfo.ContactPhone
comment := ""
if tmpDiffStore.Coordinate != tmpDiffStore.CoordinateMT { if tmpDiffStore.Coordinate != tmpDiffStore.CoordinateMT {
comment += "坐标不同;" comment += "坐标不同;"
} }
@@ -3731,9 +3730,7 @@ func GetDiffJxStoreAndMTWMStoreInfo(ctx *jxcontext.Context, storeIDs []int) (err
if tmpDiffStore.Phone != tmpDiffStore.PhoneMT { if tmpDiffStore.Phone != tmpDiffStore.PhoneMT {
comment += "电话不同;" comment += "电话不同;"
} }
if comment != "" { tmpDiffStore.Comment = comment
tmpDiffStoreList = append(tmpDiffStoreList, tmpDiffStore)
}
} }
excelConf := &excel.Obj2ExcelSheetConfig{ excelConf := &excel.Obj2ExcelSheetConfig{