From d055493539320ec19eb2edb032c76543a0b9de9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 19 May 2023 10:54:56 +0800 Subject: [PATCH] 1 --- platformapi/fnpsapi/fn_test.go | 7 ------- platformapi/mtpsapi/mtpsapi.go | 4 +++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/platformapi/fnpsapi/fn_test.go b/platformapi/fnpsapi/fn_test.go index a9c0b00c..3ef845bc 100644 --- a/platformapi/fnpsapi/fn_test.go +++ b/platformapi/fnpsapi/fn_test.go @@ -7,7 +7,6 @@ import ( "git.rosy.net.cn/jx-callback/globals" "go.uber.org/zap" "testing" - "time" ) var ( @@ -186,9 +185,3 @@ func TestQueryOrder(t *testing.T) { globals.SugarLogger.Debug("data:= %s", utils.Format4Output(data, false)) globals.SugarLogger.Debug("err:= %s", utils.Format4Output(err, false)) } - -func TestTime(t *testing.T) { - fmt.Println(time.Now().UnixNano() / 1e6) - fmt.Println(1683530814777) - fmt.Println(time.Now().UnixNano()/1e6 - 1683530814777) -} diff --git a/platformapi/mtpsapi/mtpsapi.go b/platformapi/mtpsapi/mtpsapi.go index cc2303ae..b4f5b73c 100644 --- a/platformapi/mtpsapi/mtpsapi.go +++ b/platformapi/mtpsapi/mtpsapi.go @@ -5,6 +5,7 @@ import ( "fmt" "git.rosy.net.cn/baseapi/platformapi" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/globals" "net/http" "net/url" "sort" @@ -346,7 +347,8 @@ func (a *API) QueryOrderStatus(deliveryId int64, mtPeiSongId string) (retVal map if err != nil { return nil, err } - result.Data["delivery_fee"] = utils.MustInterface2Float64(result.Data["delivery_fee"]) + utils.MustInterface2Float64(utils.WayBillDeliveryMarkUp) + globals.SugarLogger.Debugf("QueryOrderStatus===========: %s", utils.Format4Output(result, false)) + result.Data["delivery_fee"] = utils.MustInterface2Float64(result.Data["delivery_fee"]) + (float64(utils.WayBillDeliveryMarkUp) / 100) result.Data["pay_amount"] = utils.MustInterface2Float64(result.Data["pay_amount"]) return result.Data, nil }