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

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2023-08-09 15:43:20 +08:00
parent 26c4c691bb 26dc50feb3
commit 9a391f3839
1 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
business/partner/delivery/sfps/waybill.go
View File

@@ -92,16 +92,17 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i
var ( var (
weight int weight int
flag = false
productDetail []*sfps2.ProductDetail productDetail []*sfps2.ProductDetail
param = &sfps2.CreateOrderReq{}
) )
if order.Weight >= 49500 || order.Weight <= model.NO { if order.Weight >= 49500 || order.Weight <= model.NO {
weight = 49500 weight = 49500
} else { } else {
weight = order.Weight weight = order.Weight
} }
param = &sfps2.CreateOrderReq{
param := &sfps2.CreateOrderReq{ //ShopId: sfps2.SFShopStoreID,
ShopId: sfps2.SFShopStoreID,
ShopOrderId: order.VendorOrderID, ShopOrderId: order.VendorOrderID,
OrderSource: GetVendorSource(order.VendorID), OrderSource: GetVendorSource(order.VendorID),
OrderTime: order.CreatedAt.Unix(), OrderTime: order.CreatedAt.Unix(),
@@ -130,7 +131,19 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i
ProductTypeNum: int64(order.SkuCount), ProductTypeNum: int64(order.SkuCount),
}, },
} }
// 城市维度获取顺丰门店id
if len(store.CityName) > 0 {
for k, v := range sfps2.SFCityStoreIDs {
globals.SugarLogger.Debugf("sfps GetWaybillFee store.CityName==%s,k=%s", store.CityName, k)
if strings.Contains(store.CityName, k) || store.CityName == k {
param.ShopId = v
flag = true
}
}
}
if flag == false || len(store.CityName) == 0 {
return nil, errors.New("此城市暂时不在，顺丰配送业务范围")
}
if len(order.Skus) != model.NO { if len(order.Skus) != model.NO {
for _, v := range order.Skus { for _, v := range order.Skus {
productDetail = append(productDetail, &sfps2.ProductDetail{ productDetail = append(productDetail, &sfps2.ProductDetail{
@@ -203,7 +216,8 @@ func (d DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) { func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) {
var ( var (
weight int weight int
param *sfps2.PreCreateOrderReq flag = false
//param = &sfps2.PreCreateOrderReq{}
) )
// 默认重量 // 默认重量
@@ -217,19 +231,7 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo
if err != nil { if err != nil {
return nil, err return nil, err
} }
// 城市维度获取顺丰门店id param := &sfps2.PreCreateOrderReq{
if len(store.CityName) > 0 {
for k, v := range sfps2.SFCityStoreIDs {
if strings.Contains(k, store.CityName) {
param.ShopId = v
} else {
return nil, errors.New("此城市暂时不在顺丰配送业务范围")
}
}
} else {
return nil, errors.New("门店不允许没有城市名，请检查门店信息")
}
param = &sfps2.PreCreateOrderReq{
//ShopId: sfps2.SFShopStoreID, //ShopId: sfps2.SFShopStoreID,
UserLng: utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLng)), UserLng: utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLng)),
UserLat: utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLat)), UserLat: utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLat)),
@@ -247,6 +249,19 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo
ShopLng: utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng)), ShopLng: utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng)),
}, },
} }
// 城市维度获取顺丰门店id
if len(store.CityName) > 0 {
for k, v := range sfps2.SFCityStoreIDs {
globals.SugarLogger.Debugf("sfps GetWaybillFee store.CityName==%s,k=%s", store.CityName, k)
if strings.Contains(store.CityName, k) || store.CityName == k {
param.ShopId = v
flag = true
}
}
}
if flag == false || len(store.CityName) == 0 {
return nil, errors.New("此城市暂时不在，顺丰配送业务范围")
}
deliveryFeeInfo = &partner.WaybillFeeInfo{} deliveryFeeInfo = &partner.WaybillFeeInfo{}
price, err := api.SfPsAPI.PreCreateOrder(param) price, err := api.SfPsAPI.PreCreateOrder(param)
deliveryFeeInfo.DeliveryFee = utils.Float64TwoInt64(price) deliveryFeeInfo.DeliveryFee = utils.Float64TwoInt64(price)