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

1

Browse Source
This commit is contained in:
richboo111
2023-08-09 10:49:32 +08:00
parent 1926077620
commit f321c2b492
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,6 +216,7 @@ 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
flag = false
param *sfps2.PreCreateOrderReq param *sfps2.PreCreateOrderReq
) )
@@ -236,12 +237,12 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo
globals.SugarLogger.Debugf("sfps GetWaybillFee store.CityName==%s,k=%s", store.CityName, k) globals.SugarLogger.Debugf("sfps GetWaybillFee store.CityName==%s,k=%s", store.CityName, k)
if strings.Contains(store.CityName, k) || store.CityName == k { if strings.Contains(store.CityName, k) || store.CityName == k {
param.ShopId = v param.ShopId = v
} else { flag = true
return nil, errors.New("此城市暂时不在顺丰配送业务范围")
} }
} }
} else { }
return nil, errors.New("门店不允许没有城市名，请检查门店信息") if flag == false || len(store.CityName) == 0 {
return nil, errors.New("此城市暂时不在，顺丰配送业务范围")
} }
param = &sfps2.PreCreateOrderReq{ param = &sfps2.PreCreateOrderReq{
//ShopId: sfps2.SFShopStoreID, //ShopId: sfps2.SFShopStoreID,