From 4b4bfa11841eed48d0ed71fa6be8ed9ff187f28f Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Jan 2024 16:45:07 +0800 Subject: [PATCH] 1 --- business/partner/delivery/sfps/waybill.go | 8 ++++---- globals/api/api.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 0eb396399..393bec622 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -146,8 +146,8 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i } } if flag == false || len(store.CityName) == 0 { - flag = true //todo sf测试用 - //return nil, errors.New("此城市暂时不在，顺丰配送业务范围") + //flag = true //todo sf测试用 + return nil, errors.New("此城市暂时不在，顺丰配送业务范围") } if len(order.Skus) != model.NO { for _, v := range order.Skus { @@ -277,8 +277,8 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo } } if flag == false || len(store.CityName) == 0 { - flag = true //todo sf测试用 - //return nil, errors.New("此城市暂时不在，顺丰配送业务范围") + //flag = true //todo sf测试用 + return nil, errors.New("此城市暂时不在，顺丰配送业务范围") } deliveryFeeInfo = &partner.WaybillFeeInfo{} price, err := api.SfPsAPI.PreCreateOrder(param) diff --git a/globals/api/api.go b/globals/api/api.go index 1c3f208ef..2eb540b32 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -311,8 +311,8 @@ func Init() { FnAPI = fnpsapi.New(beego.AppConfig.DefaultString("fnAppID", ""), beego.AppConfig.DefaultString("fnAppSecret", ""), beego.AppConfig.DefaultString("fnMerchantId", ""), beego.AppConfig.DefaultString("fnCode", "")) //测试 - SfPsAPI = sfps2.New(beego.AppConfig.DefaultInt("sfpsTestAppID", 0), beego.AppConfig.DefaultString("sfpsTestAppKey", "")) - //SfPsAPI = sfps2.New(beego.AppConfig.DefaultInt("sfpsAppID", 0), beego.AppConfig.DefaultString("sfpsAppKey", "")) + //SfPsAPI = sfps2.New(beego.AppConfig.DefaultInt("sfpsTestAppID", 0), beego.AppConfig.DefaultString("sfpsTestAppKey", "")) + SfPsAPI = sfps2.New(beego.AppConfig.DefaultInt("sfpsAppID", 0), beego.AppConfig.DefaultString("sfpsAppKey", "")) UuAPI = uuptapi.New(beego.AppConfig.DefaultString("uuAppID", ""), beego.AppConfig.DefaultString("uuAppKey", ""), beego.AppConfig.DefaultString("uuOpenID", "")) FeieAPI = feieapi.New(beego.AppConfig.DefaultString("feieUser", ""), beego.AppConfig.DefaultString("feieKey", "")) XiaoWMAPI = xiaowmapi.New(beego.AppConfig.DefaultInt("xiaoWMAppID", 0), beego.AppConfig.DefaultString("xiaoWMAppKey", ""))