From 9406e5cb01b911d634d94151cb7a52e474365878 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 29 May 2023 11:19:52 +0800 Subject: [PATCH 1/2] 1 --- business/partner/delivery/sfps/waybill.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 59374b9d9..6b92b4115 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -185,6 +185,7 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo Weight: int64(weight), ProductType: sfps2.ProductTypeFresh, ShopType: sfps2.OrderTypeSF, + LbsType: sfps2.LbsTypeGD, Shop: &sfps2.SfShopInfo{ ShopName: order.StoreName, ShopPhone: store.Tel1, From 66998a2743b1abcf5fcf08162cc5048f4ef6b399 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 29 May 2023 11:23:28 +0800 Subject: [PATCH 2/2] 1 --- business/partner/delivery/sfps/waybill.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 6b92b4115..80240e8a6 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -178,14 +178,15 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo return nil, err } param := &sfps2.PreCreateOrderReq{ - ShopId: sfps2.SFShopStoreID, - UserLng: utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLng)), - UserLat: utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLat)), - UserAddress: order.ConsigneeAddress, - Weight: int64(weight), - ProductType: sfps2.ProductTypeFresh, - ShopType: sfps2.OrderTypeSF, - LbsType: sfps2.LbsTypeGD, + ShopId: sfps2.SFShopStoreID, + UserLng: utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLng)), + UserLat: utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLat)), + UserAddress: order.ConsigneeAddress, + Weight: int64(weight), + ProductType: sfps2.ProductTypeFresh, + ShopType: sfps2.OrderTypeSF, + LbsType: sfps2.LbsTypeGD, + RiderPickMethod: sfps2.RiderPickUpMethodSTU, Shop: &sfps2.SfShopInfo{ ShopName: order.StoreName, ShopPhone: store.Tel1,