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

This commit is contained in:
邹宗楠
2023-05-29 13:48:37 +08:00

View File

@@ -178,13 +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,
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,