1

business/lakala/lakala_callback.go

@@ -11,6 +11,27 @@ import (
 	"time"
 )
 
+// ApplyContract 电子合同申请回调
+func ApplyContract(callback *lakala.ApplyContractCallBack) error {
+	var (
+		db = dao.GetDB()
+	)
+	if callback.Code == "000000" {
+		merchantInfo, err := dao.GetStoreContract(db, 0, callback.RespData.OrderNo)
+		if err != nil {
+			return err
+		}
+
+		merchantInfo.ContractStatus = callback.RespData.AuditStatus
+		_, err = dao.UpdateEntity(db, merchantInfo, "ContractStatus")
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // CreateSeparateShop 商户分账业务回调(创建/修改)
 func CreateSeparateShop(callback *lakala.SeparateCallback) error {
 	var (

business/lakala/lakala_incoming.go

@@ -9,7 +9,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
-	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 	"strings"
 	"time"
@@ -17,14 +16,55 @@ import (
 
 //#region 进件相关API
 
+// LaKaLaApplyContract 拉卡拉申请签约合同
+func LaKaLaApplyContract(ctx *jxcontext.Context, apply *lakala.ApplyContractParam, storeID int) (*lakala.ApplyContractResp, error) {
+	apply.OrderNo = lakala.GetOrderNumber(10)
+	apply.RetUrl = lakala.ApplyContractCallback
+	contractObj, err := api.LaKaLaApi.ApplyElectronicContract(apply)
+	if err != nil {
+		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
+	}
+
+	return contractObj, nil
+}
+
+// QueryElectronicContract 拉卡拉签约合同查询
+func QueryElectronicContract(orderNo string, orgId int, ecApplyId string, storeID int) (*lakala.ElectronicContractStatus, error) {
+	db := dao.GetDB()
+	merchantInfo, err := dao.GetStoreContract(db, storeID, orderNo)
+	if err != nil {
+		return nil, err
+	}
+
+	contractObj, err := api.LaKaLaApi.QueryElectronicContract(orderNo, orgId, ecApplyId)
+	if err != nil {
+		return nil, err
+	}
+	merchantInfo.ContractStatus = contractObj.AuditStatus
+	dao.UpdateEntity(db, merchantInfo, "ContractStatus")
+
+	return contractObj, nil
+}
+
 // LaKaLaInComing 商户进件
 func LaKaLaInComing(ctx *jxcontext.Context, incoming *lakala.MerchantIncomingReq, storeId int) (string, error) {
-	globals.SugarLogger.Debugf("---------lakala : %s ", utils.Format4Output(incoming, false))
 	merchantNo, status, err := api.LaKaLaApi.MerchantIncoming(incoming)
 	if err != nil {
 		return "", err
 	}
-	globals.SugarLogger.Debugf("---------LaKaLaInComing : %s , %s", merchantNo, status)
 	incomingObj := &model.LakalaIncoming{
 		StoreId:        storeId,
 		MerchantNo:     merchantNo,
@@ -833,4 +873,9 @@ func WithdrawalList(merchantNo, drawJnl, acctName, startTime, endTime string, pa
 	return dao.WithdrawalList(merchantNo, drawJnl, acctName, start, end, pageSize, offset)
 }
 
+// QueryApplyContractList 门店合同申请记录
+func QueryApplyContractList(orderNo string, storeID, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
+	return dao.QueryApplyContractList(orderNo, storeID, pageSize, offset)
+}
+
 //#endregion