From 1b307f433553826c7915d2a7fe3c9a335c619d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 22 Jul 2025 17:40:27 +0800
Subject: [PATCH] 1

---
 business/lakala/lakala_callback.go | 20 ++++++++++++++++++++
 business/lakala/lakala_incoming.go |  2 +-
 controllers/lakala_callback.go     | 21 +++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/business/lakala/lakala_callback.go b/business/lakala/lakala_callback.go
index 0aee78ef1..1c48f9bdd 100644
--- a/business/lakala/lakala_callback.go
+++ b/business/lakala/lakala_callback.go
@@ -16,6 +16,26 @@ func ApplyContract(callback *lakala.ApplyContractCallBack) error {
 	var (
 		db = dao.GetDB()
 	)
+
+	merchantInfo, err := dao.GetStoreContract(db, 0, callback.OrderNo, utils.Int64ToStr(callback.EcApplyId))
+	if err != nil {
+		return err
+	}
+
+	merchantInfo.ContractStatus = callback.EcStatus
+	_, err = dao.UpdateEntity(db, merchantInfo, "ContractStatus")
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// ApplyContractByPeople 电子合同申请人工审核回调
+func ApplyContractByPeople(callback *lakala.ApplyContractByPeopleCallBack) error {
+	var (
+		db = dao.GetDB()
+	)
 	if callback.Code == "000000" {
 		merchantInfo, err := dao.GetStoreContract(db, 0, callback.RespData.OrderNo, "")
 		if err != nil {
diff --git a/business/lakala/lakala_incoming.go b/business/lakala/lakala_incoming.go
index 7cd80255e..405f04d56 100644
--- a/business/lakala/lakala_incoming.go
+++ b/business/lakala/lakala_incoming.go
@@ -46,7 +46,7 @@ func LaKaLaApplyContract(ctx *jxcontext.Context, apply *lakala.ApplyContractPara
 // LaKaLaApplyContractByPeople 生气人工审核 ApplyElectronicContractByPeople
 func LaKaLaApplyContractByPeople(storeId int, apply *lakala.ApplyContractByPeople) (string, error) {
 	apply.OrderNo = lakala.GetOrderNumber(8)
-	apply.RetUrl = lakala.ApplyContractCallback
+	apply.RetUrl = lakala.ApplyContractByPeopleCallback
 	err := api.LaKaLaApi.ApplyElectronicContractByPeople(apply)
 	if err != nil {
 		return "", fmt.Errorf("申请人工审核失败:%v", err)
diff --git a/controllers/lakala_callback.go b/controllers/lakala_callback.go
index 00ebaab61..0521cff0a 100644
--- a/controllers/lakala_callback.go
+++ b/controllers/lakala_callback.go
@@ -35,6 +35,27 @@ func (c *LaKaLaCallbackController) applyContract() {
 	return
 }
 
+// applyContractByPeople 合同申请人工审核回调
+func (c *LaKaLaCallbackController) applyContractByPeople() {
+	body, err := ioutil.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.Data["json"] = lakala.CallBackResultInfo(err)
+		c.ServeJSON()
+		return
+	}
+	globals.SugarLogger.Debugf("-----applyContractByPeople := %s", string(body))
+	apply := &lakala.ApplyContractByPeopleCallBack{}
+	if err = json.Unmarshal(body, apply); err != nil {
+		c.Data["json"] = lakala.CallBackResultInfo(err)
+		c.ServeJSON()
+		return
+	}
+
+	c.Data["json"] = lakala.CallBackResultInfo(lakalaServer.ApplyContractByPeople(apply))
+	c.ServeJSON()
+	return
+}
+
 // SeparateMsg 商户开通/修改分账业务回调
 func (c *LaKaLaCallbackController) SeparateMsg() {
 	body, err := ioutil.ReadAll(c.Ctx.Request.Body)