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

- 在创建快递门店时，处理PayeeName为空的情况

Browse Source
This commit is contained in:
gazebo
2019-07-24 17:39:37 +08:00
parent 464692ae0b
commit ac7c086b7a
4 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
business/partner/delivery/dada/waybill.go
View File

@@ -131,7 +131,8 @@ func StoreDetail2ShopInfo(storeDetail *dao.StoreDetail2) (shopInfo *dadaapi.Shop
}
shopInfo = &dadaapi.ShopInfo{
OriginShopID: storeDetail.VendorStoreID,
StationName: storeDetail.CourierStoreName,
StationName: storeDetail.Name,
Business: dadaapi.BusinessTypeConvStore, // 故意设置成这个的
CityName: cityName,
AreaName: districtName,
StationAddress: storeDetail.Address,
@@ -165,17 +166,17 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt
if err == nil {
storeDetail = &dao.StoreDetail2{
Store: model.Store{
Name: shopInfo.StationName,
Address: shopInfo.StationAddress,
Lng: jxutils.StandardCoordinate2Int(shopInfo.Lng),
Lat: jxutils.StandardCoordinate2Int(shopInfo.Lat),
PayeeName: shopInfo.ContactName,
Tel1: shopInfo.Phone,
},
VendorID: model.VendorIDDada,
VendorStoreID: shopInfo.OriginShopID,
CourierStoreName: shopInfo.StationName,
CityName: shopInfo.CityName,
DistrictName: shopInfo.AreaName,
VendorID: model.VendorIDDada,
VendorStoreID: shopInfo.OriginShopID,
CityName: shopInfo.CityName,
DistrictName: shopInfo.AreaName,
}
}
return storeDetail, err

8
business/partner/delivery/mtps/store.go
View File

@@ -41,7 +41,7 @@ func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.S
}
shopInfo := &mtpsapi.ShopInfo{
ShopID: storeDetail.VendorStoreID,
ShopName: storeDetail.CourierStoreName,
ShopName: storeDetail.Name,
Category: mtpsapi.ShopCategoryFruit,
SecondCategory: mtpsapi.ShopCategoryFruitFruit,
ContactName: storeDetail.PayeeName,
@@ -67,6 +67,7 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt
if err == nil {
storeDetail = &dao.StoreDetail2{
Store: model.Store{
Name: shopInfo.ShopName,
CityCode: shopInfo.City,
PayeeName: shopInfo.ContactName,
Tel1: shopInfo.ContactPhone,
@@ -74,9 +75,8 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt
Lng: shopInfo.ShopLng,
Lat: shopInfo.ShopLat,
},
VendorID: model.VendorIDMTPS,
VendorStoreID: shopInfo.ShopID,
CourierStoreName: shopInfo.ShopName,
VendorID: model.VendorIDMTPS,
VendorStoreID: shopInfo.ShopID,
}
}
return storeDetail, err