From eb59d502e0ec3b7e8fb338003346ec7a4a0f8def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 4 Aug 2025 16:46:43 +0800 Subject: [PATCH] 1 --- platformapi/lakala/lakala_pay.go | 12 ++++++------ platformapi/lakala/lakala_separate_accounts.go | 12 ++++++------ platformapi/lakala/lakala_token_model.go | 8 ++++++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/platformapi/lakala/lakala_pay.go b/platformapi/lakala/lakala_pay.go index 58c60935..43b5dbce 100644 --- a/platformapi/lakala/lakala_pay.go +++ b/platformapi/lakala/lakala_pay.go @@ -144,7 +144,7 @@ type ClosePayMiniOrder struct { } // ScannerPayMicroPay 扫码枪扫码支付 -func (a *API) ScannerPayMicroPay(param *PayMicroPayReq) (string, string, string, error) { +func (a *API) ScannerPayMicroPay(param *PayMicroPayReq) (string, string, string, string, error) { reqParameter := map[string]interface{}{ "req_data": utils.Struct2Map(param, "", false), "version": Version3, @@ -152,23 +152,23 @@ func (a *API) ScannerPayMicroPay(param *PayMicroPayReq) (string, string, string, } result, err := a.AccessAPISign(PayProdUrl, PayMicropayActive, http.MethodPost, "", reqParameter) if err != nil { - return "", "", "", err + return "", "", "", "", err } switch result["code"].(string) { case PaySuccess, "BBS10000", "BBS11105": bodyResult, err := json.Marshal(result["resp_data"]) if err != nil { - return "", "", "", err + return "", "", "", "", err } resp := &PayMicroPayResp{} if err = json.Unmarshal(bodyResult, resp); err != nil { - return "", "", "", err + return "", "", "", "", err } - return result["code"].(string), result["msg"].(string), resp.TradeNo, nil + return result["code"].(string), result["msg"].(string), resp.TradeNo, resp.LogNo, nil default: - return "", "", "", fmt.Errorf(result["msg"].(string)) + return "", "", "", "", fmt.Errorf(result["msg"].(string)) } } diff --git a/platformapi/lakala/lakala_separate_accounts.go b/platformapi/lakala/lakala_separate_accounts.go index 8ae681d9..78a13cf6 100644 --- a/platformapi/lakala/lakala_separate_accounts.go +++ b/platformapi/lakala/lakala_separate_accounts.go @@ -281,7 +281,7 @@ func (a *API) SeparateUnBind(param *SeparateUnBindReq) (string, error) { } // Separate 分账 -func (a *API) Separate(param *OrderSeparateReq) (string, string, string, error) { +func (a *API) Separate(param *OrderSeparateReq) (string, string, error) { reqParameter := map[string]interface{}{ "req_data": utils.Struct2Map(param, "", false), "version": Version, @@ -289,23 +289,23 @@ func (a *API) Separate(param *OrderSeparateReq) (string, string, string, error) } result, err := a.AccessAPISign(SeparateProd, SeparateOrder, http.MethodPost, "", reqParameter) if err != nil { - return "", "", "", err + return "", "", err } bodyResult, err := json.Marshal(result) if err != nil { - return "", "", "", err + return "", "", err } resp := &OrderSeparateResp{} if err = json.Unmarshal(bodyResult, resp); err != nil { - return "", "", "", err + return "", "", err } if resp.Code != SeparateSuccess { - return "", "", "", fmt.Errorf(resp.Msg) + return "", "", fmt.Errorf(resp.Msg) } - return resp.RespData.Status, resp.RespData.SeparateNo, resp.RespData.LogNo, nil + return resp.RespData.Status, resp.RespData.SeparateNo, nil } diff --git a/platformapi/lakala/lakala_token_model.go b/platformapi/lakala/lakala_token_model.go index 05c6df52..142d14aa 100644 --- a/platformapi/lakala/lakala_token_model.go +++ b/platformapi/lakala/lakala_token_model.go @@ -82,17 +82,21 @@ const ( IncomingUrlProd = "https://tkapi.lakala.com/auth/oauth" // 进件获取token正式地址 ModifiedUrlProd = "https://htkapi.lakala.com/auth/oauth" // 变更接口token正式地址 + + PayWayRegister = "register" // 聚合被扫 + PayWayMini = "mini" // 小程序聚合主扫 + PayWayAPP = "app" // APP收银台支付 ) const ( + OrderStatusCallback = "http://callback.jxc4.com/lakalaCallback/orderStatus" // 收银台订单通知(订单状态:app/h5) + PayStatusCallback = "http://callback.jxc4.com/lakalaCallback/payStatus" // 聚合被扫(扫码枪)/聚合主扫 CallbackLaKaLaShopUrl = "http://callback.jxc4.com/lakalaCallback/separateMsg" // 消息通知地址(商户开通) ApplyContractByPeopleCallback = "http://callback.jxc4.com/lakalaCallback/applyContractByPeople" // 电子合同人工审核回调 ApplyContractCallback = "http://callback.jxc4.com/lakalaCallback/applyContract" // 电子合同人工审核回调 CallbackLaKaLaSeparateBindUrl = "http://callback.jxc4.com/lakalaCallback/separateBind" // 消息通知地址(分账关系绑定回调,解绑回调) CallbackLaKaLaSeparateUrl = "http://callback.jxc4.com/lakalaCallback/separate" // 消息通知地址(分账申请/撤回/退回 回调) BillProdCallbackUrl = "http://callback.jxc4.com/lakalaCallback/ewalletWithdrawD1" // 账户D1提现回调 - OrderStatusCallback = "http://callback.jxc4.com/lakalaCallback/orderStatus" // 收银台订单通知(订单状态) - PayStatusCallback = "http://callback.jxc4.com/lakalaCallback/payStatus" // 主扫支付状态通知 //CallbackLaKaLaShopUrl = "http://111.231.218.230:8080/laKaLaCallback/separateMsg" // 消息通知地址(商户开通) //ApplyContractByPeopleCallback = "http://111.231.218.230:8080/lakalaCallback/applyContractByPeople" // 电子合同人工审核回调