From 33aba471ef121e5ea8ed435b1436b72ab6554d39 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 9 Aug 2023 10:35:10 +0800 Subject: [PATCH 1/5] 1 --- business/partner/delivery/sfps/waybill.go | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 19205d908..4f5fb0e62 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -93,14 +93,27 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i var ( weight int productDetail []*sfps2.ProductDetail + param = &sfps2.CreateOrderReq{} ) if order.Weight >= 49500 || order.Weight <= model.NO { weight = 49500 } else { weight = order.Weight } - - param := &sfps2.CreateOrderReq{ + // 城市维度获取顺丰门店id + if len(store.CityName) > 0 { + globals.SugarLogger.Debugf("sfps CreateWaybill store.CityName==%s", store.CityName) + 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.CreateOrderReq{ ShopId: sfps2.SFShopStoreID, ShopOrderId: order.VendorOrderID, OrderSource: GetVendorSource(order.VendorID), @@ -219,6 +232,7 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo } // 城市维度获取顺丰门店id if len(store.CityName) > 0 { + globals.SugarLogger.Debugf("sfps GetWaybillFee store.CityName==%s", store.CityName) for k, v := range sfps2.SFCityStoreIDs { if strings.Contains(k, store.CityName) { param.ShopId = v From 192607762043345610e1ede1eaf5632cdf6175f3 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 9 Aug 2023 10:44:50 +0800 Subject: [PATCH 2/5] 1 --- business/partner/delivery/sfps/waybill.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 4f5fb0e62..9519b7aaf 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -232,9 +232,9 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo } // 城市维度获取顺丰门店id if len(store.CityName) > 0 { - globals.SugarLogger.Debugf("sfps GetWaybillFee store.CityName==%s", store.CityName) for k, v := range sfps2.SFCityStoreIDs { - if strings.Contains(k, store.CityName) { + 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 } else { return nil, errors.New("此城市暂时不在顺丰配送业务范围") From f321c2b492c413d4aadb5277b50ddbe8b0516b73 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 9 Aug 2023 10:49:32 +0800 Subject: [PATCH 3/5] 1 --- business/partner/delivery/sfps/waybill.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 9519b7aaf..c0dc17a95 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -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) { var ( weight int + flag = false 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) if strings.Contains(store.CityName, k) || store.CityName == k { param.ShopId = v - } else { - return nil, errors.New("此城市暂时不在顺丰配送业务范围") + flag = true } } - } else { - return nil, errors.New("门店不允许没有城市名，请检查门店信息") + } + if flag == false || len(store.CityName) == 0 { + return nil, errors.New("此城市暂时不在，顺丰配送业务范围") } param = &sfps2.PreCreateOrderReq{ //ShopId: sfps2.SFShopStoreID, From 85cc8a284f20a87202a2b2242b13131193d75205 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 9 Aug 2023 10:57:26 +0800 Subject: [PATCH 4/5] 1 --- business/partner/delivery/sfps/waybill.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index c0dc17a95..64cffcd8c 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -217,7 +217,7 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo var ( weight int flag = false - param *sfps2.PreCreateOrderReq + param = &sfps2.PreCreateOrderReq{} ) // 默认重量 From 26dc50feb3404614c6668e24ac3f503d4f88dfb3 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 9 Aug 2023 11:01:50 +0800 Subject: [PATCH 5/5] 1 --- business/partner/delivery/sfps/waybill.go | 60 +++++++++++------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 64cffcd8c..fced88465 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -92,6 +92,7 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i var ( weight int + flag = false productDetail []*sfps2.ProductDetail param = &sfps2.CreateOrderReq{} ) @@ -100,21 +101,8 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i } else { weight = order.Weight } - // 城市维度获取顺丰门店id - if len(store.CityName) > 0 { - globals.SugarLogger.Debugf("sfps CreateWaybill store.CityName==%s", store.CityName) - 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.CreateOrderReq{ - ShopId: sfps2.SFShopStoreID, + //ShopId: sfps2.SFShopStoreID, ShopOrderId: order.VendorOrderID, OrderSource: GetVendorSource(order.VendorID), OrderTime: order.CreatedAt.Unix(), @@ -143,7 +131,19 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i 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 { for _, v := range order.Skus { productDetail = append(productDetail, &sfps2.ProductDetail{ @@ -217,7 +217,7 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo var ( weight int flag = false - param = &sfps2.PreCreateOrderReq{} + //param = &sfps2.PreCreateOrderReq{} ) // 默认重量 @@ -231,20 +231,7 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo if err != nil { return nil, err } - // 城市维度获取顺丰门店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("此城市暂时不在，顺丰配送业务范围") - } - param = &sfps2.PreCreateOrderReq{ + param := &sfps2.PreCreateOrderReq{ //ShopId: sfps2.SFShopStoreID, UserLng: utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLng)), UserLat: utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLat)), @@ -262,6 +249,19 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo 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{} price, err := api.SfPsAPI.PreCreateOrder(param) deliveryFeeInfo.DeliveryFee = utils.Float64TwoInt64(price)