liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改各种发单是扣款,品牌扣款和门店扣款,品牌充值门店充值

Browse Source
This commit is contained in:
邹宗楠
2023-05-11 10:56:05 +08:00
parent 28f172133b
commit 381447307d
17 changed files with 108 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
platformapi/fnpsapi/fn_test.go
View File

@@ -1,13 +1,13 @@
package fnpsapi
import (
"encoding/json"
"fmt"
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
"go.uber.org/zap"
"math/rand"
"testing"
"time"
)
var (
@@ -20,9 +20,9 @@ func init() {
sugarLogger = logger.Sugar()
baseapi.Init(sugarLogger)
//api = New("6705486294797503379", "c1e6c280-e618-4103-9d0a-673bc54fb22e", "5375691", "cabrXQf9eFMVWVYg4hNlwu")
api = New("6705486294797503379", "c1e6c280-e618-4103-9d0a-673bc54fb22e", "51658", "cabrXQf9eFMVWVYg4hNlwu")
//token, _ := api.GetAccessToken()
//api.accessToken = token.BusinessDataObj.AccessToken
api.accessToken = "5638ebf7-e69e-498b-8b47-96336ca720bc"
}
// 查询单个门店
@@ -179,31 +179,14 @@ func TestGetOrder(t *testing.T) {
fmt.Println(baseDeliveryFee)
}
func TestDataUnmas(t *testing.T) {
data := `{"signature":"5a4270c8fb3c4a3a641d2f5f66990c503c7248ecd51248b020e0b44db75a6761","app_id":"6705486294797503379","timestamp":"1648861445686","business_data":"{\"callback_business_type\":\"orderStatusNotify\",\"param\":{\"app_id\":\"6705486294797503379\",\"carrier_driver_name\":\"\",\"carrier_driver_phone\":\"\",\"order_id\":300000388333833530,\"order_status\":1,\"partner_order_code\":\"88386523916938\",\"push_time\":1648861445686,\"transfer\":0}}"}`
fnNotify := &ShortStatus{}
if err := json.Unmarshal([]byte(data), fnNotify); err != nil {
baseapi.SugarLogger.Debugf("FN callback string to ChainstoreStatusNotify failed with err:%v", err)
}
fmt.Println("data", fnNotify.BusinessData)
fmt.Println("data", fnNotify.AppId)
fmt.Println("data", fnNotify.Signature)
retsult := &OrderStatusNottify{}
err := json.Unmarshal([]byte(fnNotify.BusinessData), retsult)
fmt.Println("err1======", err)
fmt.Println("retsult", retsult)
fmt.Println("retsult", retsult.Param)
fmt.Println("retsult", retsult.CallbackBusinessType)
fmt.Println("retsult", retsult.Param.PartnerOrderCode)
func TestQueryOrder(t *testing.T) {
data, err := api.QueryOrder("1100536591119839487") // 1100537991119839487 1100536591119839487
globals.SugarLogger.Debug("data:= %s", utils.Format4Output(data, false))
globals.SugarLogger.Debug("err:= %s", utils.Format4Output(err, false))
}
func TestErr2CallbackResponse(t *testing.T) {
fmt.Println(fmt.Sprintf("%05d", rand.Intn(1000000)))
}
func Test11(t *testing.T) {
t2 := utils.Str2TimeWithDefault("2022-07-06", utils.DefaultTimeValue)
fmt.Println(t2)
func TestTime(t *testing.T) {
fmt.Println(time.Now().UnixNano() / 1e6)
fmt.Println(1683530814777)
fmt.Println(time.Now().UnixNano()/1e6 - 1683530814777)
}

4
platformapi/fnpsapi/order.go
View File

@@ -31,6 +31,8 @@ const (
OrderStatusDelivering = 2 //配送中
OrderStatusDelivered = 3 //已送达
OrderStatusException = 5 //异常
WayBillPressureOrderTime = 1200000 // 蜂鸟分配骑手超过二十分钟不扣款
)
// 蜂鸟预下单
@@ -163,7 +165,7 @@ func (a *API) PreCancelOrder(req *PreCancelOrderReq) (actualCancelCostCent int64
return
}
// cancelOrder 取消订单
// CancelOrder 取消订单
func (a *API) CancelOrder(req *CancelOrderReq) (err error) {
if req.PartnerOrderCode == "" && req.OrderId == "" {
return errors.New("内部订单号或者外部订单号比填写一个")