1

business/lakala/lakala_incoming.go

@@ -82,6 +82,24 @@ func QueryElectronicContract(orderNo string, orgId int, ecApplyId string, storeI
 	return contractObj, nil
 }
 
+// QueryElectronic 电子合同查询
+func QueryElectronic(orderNo string, orgId int, ecApplyId string, storeID int) (*lakala.QueryElectronicResp, error) {
+	db := dao.GetDB()
+	merchantInfo, err := dao.GetStoreContract(db, storeID, orderNo, "")
+	if err != nil {
+		return nil, err
+	}
+
+	contractObj, err := api.LaKaLaApi.QueryElectronic(orderNo, orgId, ecApplyId)
+	if err != nil {
+		return nil, err
+	}
+	merchantInfo.ContractStatus = contractObj.EcStatus
+	dao.UpdateEntity(db, merchantInfo, "ContractStatus")
+
+	return contractObj, nil
+}
+
 // LaKaLaInComing 商户进件
 func LaKaLaInComing(ctx *jxcontext.Context, incoming *lakala.MerchantIncomingReq, storeId int) (string, error) {
 	merchantNo, status, err := api.LaKaLaApi.MerchantIncoming(incoming)

controllers/lakala.go

@@ -63,12 +63,18 @@ func (c *LaKaLaController) LaKaLaApplyContractByPeople() {
 // @Param	orderNo			formData	string	true	"订单编号"
 // @Param	orgId			formData	int		true	"组织ID"
 // @Param	ecApplyId		formData	string	true	"申请ID"
+// @Param	queryType		formData	string	true	"查询类型[1-人工审核查询/2-电子合同申请查询]"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /QueryElectronicContract [post]
 func (c *LaKaLaController) QueryElectronicContract() {
 	c.callQueryElectronicContract(func(params *tLakalaQueryElectronicContractParams) (retVal interface{}, errCode string, err error) {
-		retVal, err = lakalaServer.QueryElectronicContract(params.OrderNo, params.OrgId, params.EcApplyId, params.StoreID)
+		switch params.QueryType {
+		case "1":
+			retVal, err = lakalaServer.QueryElectronicContract(params.OrderNo, params.OrgId, params.EcApplyId, params.StoreID)
+		case "2":
+			retVal, err = lakalaServer.QueryElectronic(params.OrderNo, params.OrgId, params.EcApplyId, params.StoreID)
+		}
 		return
 	})
 }