From b92fc6bc88f7e1607cf15a6963feea88916bfb96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 22 Jul 2025 17:39:40 +0800 Subject: [PATCH] 1 --- platformapi/lakala/lakala_callback_model.go | 15 +++++++++++++-- platformapi/lakala/lakala_token_model.go | 18 ++++++++++-------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/platformapi/lakala/lakala_callback_model.go b/platformapi/lakala/lakala_callback_model.go index 02db1fc5..4707bd3a 100644 --- a/platformapi/lakala/lakala_callback_model.go +++ b/platformapi/lakala/lakala_callback_model.go @@ -1,7 +1,7 @@ package lakala -// ApplyContractCallBack 合同生气回调 -type ApplyContractCallBack struct { +// ApplyContractCallBack 电子合同申请人工审核回调 +type ApplyContractByPeopleCallBack struct { Code string `json:"code"` Msg string `json:"msg"` RespData struct { @@ -16,6 +16,17 @@ type ApplyContractCallBack struct { } `json:"resp_data"` } +// ApplyContractCallBack 电子合同申请回掉 +type ApplyContractCallBack struct { + EcApplyId int64 `json:"ecApplyId"` + EcName string `json:"ecName"` + EcNo string `json:"ecNo"` + EcStatus string `json:"ecStatus"` + OrderNo string `json:"orderNo"` + OrgId int `json:"orgId"` + Version string `json:"version"` +} + // SeparateCallback 商户分账创建/修改回调 type SeparateCallback struct { ApplyId int64 `json:"applyId"` diff --git a/platformapi/lakala/lakala_token_model.go b/platformapi/lakala/lakala_token_model.go index 26414e4a..b20192f3 100644 --- a/platformapi/lakala/lakala_token_model.go +++ b/platformapi/lakala/lakala_token_model.go @@ -86,18 +86,20 @@ const ( const ( //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" // 主扫支付状态通知 - //ApplyContractCallback = "http://callback.jxc4.com/lakalaCallback/applyContract" // 合同申请回到 - CallbackLaKaLaShopUrl = "http://callback.test.jxc4.com/lakalaCallback/separateMsg" // 消息通知地址(商户开通) - ApplyContractCallback = "http://callback.test.jxc4.com/lakalaCallback/applyContract" // 合同申请回到 - CallbackLaKaLaSeparateBindUrl = "http://callback.test.jxc4.com/lakalaCallback/separateBind" // 消息通知地址(分账关系绑定回调,解绑回调) - CallbackLaKaLaSeparateUrl = "http://callback.test.jxc4.com/lakalaCallback/separate" // 消息通知地址(分账申请/撤回/退回 回调) - BillProdCallbackUrl = "http://callback.test.jxc4.com/lakalaCallback/ewalletWithdrawD1" // 账户D1提现回调 - OrderStatusCallback = "http://callback.test.jxc4.com/lakalaCallback/orderStatus" // 收银台订单通知(订单状态) - PayStatusCallback = "http://callback.test.jxc4.com/lakalaCallback/payStatus" // 主扫支付状态通知 + CallbackLaKaLaShopUrl = "http://callback.test.jxc4.com/lakalaCallback/separateMsg" // 消息通知地址(商户开通) + ApplyContractByPeopleCallback = "http://callback.test.jxc4.com/lakalaCallback/applyContractByPeople" // 电子合同人工审核回调 + ApplyContractCallback = "http://callback.test.jxc4.com/lakalaCallback/applyContract" // 电子合同申请回调 + CallbackLaKaLaSeparateBindUrl = "http://callback.test.jxc4.com/lakalaCallback/separateBind" // 消息通知地址(分账关系绑定回调,解绑回调) + CallbackLaKaLaSeparateUrl = "http://callback.test.jxc4.com/lakalaCallback/separate" // 消息通知地址(分账申请/撤回/退回 回调) + BillProdCallbackUrl = "http://callback.test.jxc4.com/lakalaCallback/ewalletWithdrawD1" // 账户D1提现回调 + OrderStatusCallback = "http://callback.test.jxc4.com/lakalaCallback/orderStatus" // 收银台订单通知(订单状态) + PayStatusCallback = "http://callback.test.jxc4.com/lakalaCallback/payStatus" // 主扫支付状态通知 )