diff --git a/platformapi/alipayapi/utils_test.go b/platformapi/alipayapi/utils_test.go index 2d7222e7..85361334 100644 --- a/platformapi/alipayapi/utils_test.go +++ b/platformapi/alipayapi/utils_test.go @@ -8,7 +8,7 @@ import ( ) func TestSystemAuthToken(t *testing.T) { - result, err := api.SystemAuthToken(GrantTypeCode, "85636904854946afa6890299e0a1VX17", "") + result, err := api.SystemAuthToken(GrantTypeCode, "e4f95e2065a84625aaf01dea2703NA17", "") if err != nil { t.Fatal(err) } diff --git a/platformapi/kuaishou_mini/kuaishou_api.go b/platformapi/kuaishou_mini/kuaishou_api.go index 6d2d7946..d72c3138 100644 --- a/platformapi/kuaishou_mini/kuaishou_api.go +++ b/platformapi/kuaishou_mini/kuaishou_api.go @@ -1,11 +1,13 @@ package kuaishou_mini import ( + "crypto/md5" "errors" "fmt" "git.rosy.net.cn/baseapi/platformapi" "git.rosy.net.cn/baseapi/utils" "net/http" + "sort" "strings" "sync" ) @@ -93,3 +95,34 @@ func (a *API) AccessAPI2(url string, params map[string]interface{}) (retVal map[ }) return retVal, err } + +// sign 签名 +func (a *API) sign(param map[string]interface{}) string { + param["app_id"] = a.appId + var paramsArr []string + for k, v := range param { + if k == "sign" || k == "access_token" { + continue + } + value := strings.TrimSpace(fmt.Sprintf("%v", v)) + if strings.HasPrefix(value, "\"") && strings.HasSuffix(value, "\"") && len(value) > 1 { + value = value[1 : len(value)-1] + } + value = strings.TrimSpace(value) + if value == "" || value == "nil" { + continue + } + paramsArr = append(paramsArr, k) + } + + sort.Strings(paramsArr) + signParma := make([]string, 0, 0) + for k, v := range paramsArr { + if utils.IsNil(param[v]) { + signParma[k] = v + "=" + fmt.Sprintf("%v", param[v]) + } + } + sign := strings.Join(signParma, "&") + a.appSecret + return fmt.Sprintf("%x", md5.Sum([]byte(sign))) + +} diff --git a/platformapi/kuaishou_mini/kuaishou_model.go b/platformapi/kuaishou_mini/kuaishou_model.go index 30d25c1a..35ecb6ee 100644 --- a/platformapi/kuaishou_mini/kuaishou_model.go +++ b/platformapi/kuaishou_mini/kuaishou_model.go @@ -24,8 +24,8 @@ type GetAutoTokenRes struct { TokenType string `json:"token_type"` } -// PreCreateOrderRes 快手预发单 -type PreCreateOrderRes struct { +// PreCreateOrderReq 快手预发单 +type PreCreateOrderReq struct { OutOrderNo string `json:"out_order_no"` // 商户系统内部订单号,只能是数字、大小写字母_-*且在同一个商户号下唯一 OpenId string `json:"open_id"` // 快手用户在当前小程序的open_id TotalAmount int64 `json:"total_amount"` // 用户支付金额,单位为[分]。 @@ -41,3 +41,9 @@ type PreCreateOrderRes struct { MultiCopiesGoodsInfo string `json:"multi_copies_goods_info"` // 单商品购买多份场景 "[{"copies":2}]" CancelOrder int64 `json:"cancel_order"` // 该字段表示创建订单的同时是否覆盖之前已存在的订单。 } + +type PreCreateOrderResponse struct { + Result int `json:"result"` + ErrorMsg string `json:"error_msg"` + OrderInfo string `json:"order_info"` //拉起收银台的 orderInfo +} diff --git a/platformapi/kuaishou_mini/kuaishou_pay.go b/platformapi/kuaishou_mini/kuaishou_pay.go index 7ee833a6..b17443c5 100644 --- a/platformapi/kuaishou_mini/kuaishou_pay.go +++ b/platformapi/kuaishou_mini/kuaishou_pay.go @@ -1,31 +1,34 @@ package kuaishou_mini import ( + "errors" "fmt" + "git.rosy.net.cn/baseapi/utils" ) // PreCreateOrder 预下单生成支付信息 -//func (a *API) PreCreateOrder(param *PreCreateOrderRes) error { -// if a.appId == "" || a.appSecret == "" { -// return error -// } -// -// result, err := a.AccessAPI2(a.FullUrl(KuaiShouPreCreateOrder), utils.Struct2MapByJson(param)) -// if err != nil { -// return "", "", err -// } -// -// auth := GetLoginAuth{} -// if err := utils.Map2StructByJson(result, &auth, false); err != nil { -// return "", "", err -// } -// -// if auth.Error != "" { -// return "", "", errors.New(auth.ErrorMsg) -// } -// -// return auth.SessionKey, auth.OpenId, nil -//} +func (a *API) PreCreateOrder(param *PreCreateOrderReq) (string, error) { + if a.appId == "" || a.appSecret == "" { + return "", errors.New("appId/appSecret 不能为空") + } + + param.Sign = a.sign(utils.Struct2MapByJson(param)) + result, err := a.AccessAPI2(a.FullUrl(KuaiShouPreCreateOrder), utils.Struct2MapByJson(param)) + if err != nil { + return "", err + } + + order := PreCreateOrderResponse{} + if err := utils.Map2StructByJson(result, &order, false); err != nil { + return "", err + } + + if order.Result != 1 { + return "", errors.New(order.ErrorMsg) + } + + return order.OrderInfo, nil +} func (a *API) FullUrl(bashUrl string) string { return fmt.Sprintf(bashUrl+"?app_id=%s&access_token=%s", a.appId, a.accessToken) diff --git a/platformapi/kuaishou_mini/kuaishou_test.go b/platformapi/kuaishou_mini/kuaishou_test.go index 2461d0d3..d4c10cd0 100644 --- a/platformapi/kuaishou_mini/kuaishou_test.go +++ b/platformapi/kuaishou_mini/kuaishou_test.go @@ -67,3 +67,26 @@ func DecryptUserMsg(sessionKey, iv, msg string) (string, error) { func TestCreateToken(t *testing.T) { api.GetToken() } + +// 快手预下单获取支付参数 +func TestPreCreateOrder(t *testing.T) { + param := &PreCreateOrderReq{ + OutOrderNo: "1024028220", + OpenId: "f198f59711c9785314bf5724f7ab9f47", + TotalAmount: 1, + Subject: "这是一个测试商品", + Detail: "大白菜,小白菜,中白菜", + TypeDetail: 1832, // 素菜 + ExpireTime: 10 * 60, + Sign: "", + Attach: "", + NotifyUrl: "https://callback.jxc4.com/tictoc/tiktokMsg", + GoodsId: "", + GoodsDetailUrl: "", + MultiCopiesGoodsInfo: "", + CancelOrder: 0, + } + data, err := api.PreCreateOrder(param) + globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false)) + globals.SugarLogger.Debugf("err := %s", utils.Format4Output(err, false)) +}