From 0c024e20e09d646343016f34b9647ce02049ec96 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 17:21:17 +0800 Subject: [PATCH] 1 --- platformapi/dadaapi/dadaapi_test.go | 58 +++++++++++--------- platformapi/dadaapi/order_test.go | 20 +++---- platformapi/kuaishou_mini/kuaishou_model.go | 28 +++++----- platformapi/kuaishou_mini/kuaishou_test.go | 28 +++++----- platformapi/tonglianpayapi/tonglianpayapi.go | 3 + 5 files changed, 71 insertions(+), 66 deletions(-) diff --git a/platformapi/dadaapi/dadaapi_test.go b/platformapi/dadaapi/dadaapi_test.go index b1d34bc1..2999d900 100644 --- a/platformapi/dadaapi/dadaapi_test.go +++ b/platformapi/dadaapi/dadaapi_test.go @@ -1,6 +1,9 @@ package dadaapi -import "go.uber.org/zap" +import ( + "git.rosy.net.cn/baseapi" + "go.uber.org/zap" +) // //import ( @@ -24,32 +27,33 @@ var ( // testShopNo = "11047059" //) // -//func init() { -// logger, _ := zap.NewDevelopment() -// sugarLogger = logger.Sugar() -// baseapi.Init(sugarLogger) -// -// // sandbox -// // dadaapi = New("dada9623324449cd250", "30c2abbfe8a8780ad5aace46300c64b9", "73753", "http://callback.jxc4.com/dada/order", false) -// -// // prod -// dadaapi = New("dada154e2a41fd6cef3", "7f97d8f258b70b450f04e7ab274ed8f8", "6660", "http://callback.jxc4.com/dadadelivery/msg", true) -// -// // prod -// testOrder = &OperateOrderParams{ -// ShopNo: testShopNo, -// OriginID: "234242342", -// CityCode: "028", -// CargoPrice: 12.34, -// IsPrepay: 1, -// ReceiverName: "我是谁", -// ReceiverAddress: "九里堤", -// ReceiverLat: 30.74631, -// ReceiverLng: 103.99112, -// ReceiverPhone: "12812345678", -// } -// -//} +func init() { + logger, _ := zap.NewDevelopment() + sugarLogger = logger.Sugar() + baseapi.Init(sugarLogger) + + // sandbox + // dadaapi = New("dada9623324449cd250", "30c2abbfe8a8780ad5aace46300c64b9", "73753", "http://callback.jxc4.com/dada/order", false) + + // prod + dadaapi = New("dada154e2a41fd6cef3", "7f97d8f258b70b450f04e7ab274ed8f8", "6660", "http://callback.jxc4.com/dadadelivery/msg", true) + + // prod + //testOrder = &OperateOrderParams{ + // ShopNo: testShopNo, + // OriginID: "234242342", + // CityCode: "028", + // CargoPrice: 12.34, + // IsPrepay: 1, + // ReceiverName: "我是谁", + // ReceiverAddress: "九里堤", + // ReceiverLat: 30.74631, + // ReceiverLng: 103.99112, + // ReceiverPhone: "12812345678", + //} + +} + // //func TestTest(t *testing.T) { // sugarLogger.Debug(utils.GetCurTimeStr()) diff --git a/platformapi/dadaapi/order_test.go b/platformapi/dadaapi/order_test.go index 7b841a94..ab162640 100644 --- a/platformapi/dadaapi/order_test.go +++ b/platformapi/dadaapi/order_test.go @@ -2,7 +2,7 @@ package dadaapi // import ( - "fmt" + "git.rosy.net.cn/baseapi" //"fmt" "testing" //"git.rosy.net.cn/baseapi" @@ -43,13 +43,14 @@ import ( // // baseapi.SugarLogger.Debug(utils.Format4Output(cancelResponse, false)) //} // -//func TestCancel(t *testing.T) { -// cancelResponse, err := dadaapi.CancelOrder("126099099192000002", ReasonIDOther, "协商一致") -// if err != nil { -// t.Fatal(err) -// } -// baseapi.SugarLogger.Debug(utils.Format4Output(cancelResponse, false)) -//} +func TestCancel(t *testing.T) { + cancelResponse, err := dadaapi.CancelOrder("1100551162883899675", ReasonIDOther, "协商一致") + if err != nil { + t.Fatal(err) + } + baseapi.SugarLogger.Debug(utils.Format4Output(cancelResponse, false)) +} + // //func TestGetComplaintReasons(t *testing.T) { // complaintReason, err := dadaapi.GetComplaintReasons() @@ -76,7 +77,4 @@ func TestQueryOrderInfo(t *testing.T) { } func TestAddTip(t *testing.T) { - payload := map[string]interface{}{"categoryID": 3095} - fmt.Println(payload["img"] != nil) - fmt.Println(payload["img"] != "") } diff --git a/platformapi/kuaishou_mini/kuaishou_model.go b/platformapi/kuaishou_mini/kuaishou_model.go index 0078149f..f8b159fa 100644 --- a/platformapi/kuaishou_mini/kuaishou_model.go +++ b/platformapi/kuaishou_mini/kuaishou_model.go @@ -26,20 +26,20 @@ type GetAutoTokenRes struct { // PreCreateOrderReq 快手预发单 type PreCreateOrderReq struct { - OutOrderNo string `json:"out_order_no"` // 商户系统内部订单号，只能是数字、大小写字母_-*且在同一个商户号下唯一 - OpenId string `json:"open_id"` // 快手用户在当前小程序的open_id - TotalAmount int64 `json:"total_amount"` // 用户支付金额，单位为[分]。 - Subject string `json:"subject"` // 商品描述。注：1汉字=2字符。 - Detail string `json:"detail"` // 商品详情。注：1汉字=2字符。 - TypeDetail int `json:"type"` // 商品类型，不同商品类目的编号见 - ExpireTime int `json:"expire_time"` // 订单过期时间，单位秒 - Sign string `json:"sign"` // 签名 - Attach string `json:"attach"` // 开发者自定义字段，回调原样回传. - NotifyUrl string `json:"notify_url"` // 回调地址 - GoodsId string `json:"goods_id"` // 下单商品id，需与商品对接 (opens new window)时的product_id一致，长度限制256个英文字符，1个汉字=2个英文字符； - GoodsDetailUrl string `json:"goods_detail_url"` // 订单详情页跳转path。 - MultiCopiesGoodsInfo string `json:"multi_copies_goods_info"` // 单商品购买多份场景 "[{"copies":2}]" - CancelOrder int64 `json:"cancel_order"` // 该字段表示创建订单的同时是否覆盖之前已存在的订单。 + OutOrderNo string `json:"out_order_no"` // 商户系统内部订单号，只能是数字、大小写字母_-*且在同一个商户号下唯一 + OpenId string `json:"open_id"` // 快手用户在当前小程序的open_id + TotalAmount int64 `json:"total_amount"` // 用户支付金额，单位为[分]。 + Subject string `json:"subject"` // 商品描述。注：1汉字=2字符。 + Detail string `json:"detail"` // 商品详情。注：1汉字=2字符。 + TypeDetail int `json:"type"` // 商品类型，不同商品类目的编号见 + ExpireTime int `json:"expire_time"` // 订单过期时间，单位秒 + Sign string `json:"sign"` // 签名 + //Attach string `json:"attach"` // 开发者自定义字段，回调原样回传. + NotifyUrl string `json:"notify_url"` // 回调地址 + //GoodsId string `json:"goods_id"` // 下单商品id，需与商品对接 (opens new window)时的product_id一致，长度限制256个英文字符，1个汉字=2个英文字符； + //GoodsDetailUrl string `json:"goods_detail_url"` // 订单详情页跳转path。 + //MultiCopiesGoodsInfo string `json:"multi_copies_goods_info"` // 单商品购买多份场景 "[{"copies":2}]" + CancelOrder int64 `json:"cancel_order"` // 该字段表示创建订单的同时是否覆盖之前已存在的订单。 } // PreCreateOrderResponse 预下单返回参数 diff --git a/platformapi/kuaishou_mini/kuaishou_test.go b/platformapi/kuaishou_mini/kuaishou_test.go index a5401dca..766127e8 100644 --- a/platformapi/kuaishou_mini/kuaishou_test.go +++ b/platformapi/kuaishou_mini/kuaishou_test.go @@ -72,20 +72,20 @@ func TestCreateToken(t *testing.T) { // 快手预下单获取支付参数 func TestPreCreateOrder(t *testing.T) { param := &PreCreateOrderReq{ - OutOrderNo: "1024028220", - OpenId: "f198f59711c9785314bf5724f7ab9f47", - TotalAmount: 1, - Subject: "这是一个测试商品", - Detail: "大白菜,小白菜,中白菜", - TypeDetail: 1832, // 素菜 - ExpireTime: 10 * 60, - Sign: "", - Attach: "1111", - NotifyUrl: "https://callback.jxc4.com/tictoc/tiktokMsg", - GoodsId: "1122", - GoodsDetailUrl: "/page/index/anima", - MultiCopiesGoodsInfo: "[{\"copies\":2}]", - CancelOrder: 0, + OutOrderNo: "88422209072664", + OpenId: "f198f59711c9785314bf5724f7ab9f47", + TotalAmount: 501, + Subject: "蔬菜水果日用品", + Detail: "收藏门店 赠送随机小惊喜一份！1g/个 x 1件商品", + TypeDetail: 1832, // 素菜 + ExpireTime: 10 * 60, + Sign: "", + //Attach: "22", + NotifyUrl: "https://callback-jxgy.jxc4.com/kuaishou/kuaiShouCallback", + //GoodsId: "1122", + //GoodsDetailUrl: "/page/index/anima", + //MultiCopiesGoodsInfo: `[{"copies":2}]`, + CancelOrder: 1, } data, err := api.PreCreateOrder(param) globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false)) diff --git a/platformapi/tonglianpayapi/tonglianpayapi.go b/platformapi/tonglianpayapi/tonglianpayapi.go index 6d194fcc..2f4c9554 100644 --- a/platformapi/tonglianpayapi/tonglianpayapi.go +++ b/platformapi/tonglianpayapi/tonglianpayapi.go @@ -3,6 +3,7 @@ package tonglianpayapi import ( "crypto/md5" "fmt" + "git.rosy.net.cn/jx-callback/globals" "net/http" "sort" "strings" @@ -192,6 +193,8 @@ func (a *API) CreateUnitorderOrder(param *CreateUnitorderOrderParam) (result *Cr params["paytype"] = param.PayType params["sub_appid"] = param.SubAppID retVal, err := a.AccessAPI(sepcAction, params) + globals.SugarLogger.Debugf("===========err := %s", utils.Format4Output(retVal, false)) + globals.SugarLogger.Debugf("===========err := %s", utils.Format4Output(err, false)) if err == nil { utils.Map2StructByJson(retVal, &result, false) }