From 43c8e2befe7cc499d2e66b9c1c8751b11d7c325d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 17 Jul 2025 11:09:21 +0800
Subject: [PATCH] 1

---
 business/lakala/lakala_incoming.go | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/business/lakala/lakala_incoming.go b/business/lakala/lakala_incoming.go
index b6f328c54..c9e97bc07 100644
--- a/business/lakala/lakala_incoming.go
+++ b/business/lakala/lakala_incoming.go
@@ -17,7 +17,7 @@ import (
 //#region 进件相关API
 
 // LaKaLaApplyContract 拉卡拉申请签约合同
-func LaKaLaApplyContract(ctx *jxcontext.Context, apply *lakala.ApplyContractParam, storeID int) (*lakala.ApplyContractResp, error) {
+func LaKaLaApplyContract(ctx *jxcontext.Context, apply *lakala.ApplyContractParam, storeID int) (*lakala.ApplyContract, error) {
 	apply.OrderNo = lakala.GetOrderNumber(10)
 	apply.RetUrl = lakala.ApplyContractCallback
 	contractObj, err := api.LaKaLaApi.ApplyElectronicContract(apply)
@@ -25,19 +25,21 @@ func LaKaLaApplyContract(ctx *jxcontext.Context, apply *lakala.ApplyContractPara
 		return nil, err
 	}
 
-	db := dao.GetDB()
-	incomingObj := &model.LakalaContract{
-		StoreId:         storeID,
-		ContractId:      contractObj.OrderNo,
-		ContractApplyId: utils.Int64ToStr(contractObj.EcApplyId),
-		ContractStatus:  "WAIT_AUDIT ",
-		ApplyType:       apply.EcTypeCode,
-	}
-	dao.WrapAddIDCULEntity(incomingObj, ctx.GetUserName())
-	if err = dao.CreateEntity(db, incomingObj); err != nil {
-		return nil, err
-	}
+	if contractObj.RespData != nil {
+		db := dao.GetDB()
+		incomingObj := &model.LakalaContract{
+			StoreId:         storeID,
+			ContractId:      contractObj.RespData.OrderNo,
+			ContractApplyId: utils.Int64ToStr(contractObj.RespData.EcApplyId),
+			ContractStatus:  "WAIT_AUDIT ",
+			ApplyType:       apply.EcTypeCode,
+		}
+		dao.WrapAddIDCULEntity(incomingObj, ctx.GetUserName())
+		if err = dao.CreateEntity(db, incomingObj); err != nil {
+			return nil, err
+		}
 
+	}
 	return contractObj, nil
 }