From 6949aa9c19087f2c6c2c21bf8ea93c4d9655f977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 23 Jul 2025 13:35:36 +0800
Subject: [PATCH] 1

---
 .../lakala/lakala_separate_accounts.go        |  7 +++-
 .../lakala/lakala_separate_accounts_model.go  | 38 +++++++++----------
 .../lakala/lakala_separate_accounts_test.go   | 11 +++---
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/platformapi/lakala/lakala_separate_accounts.go b/platformapi/lakala/lakala_separate_accounts.go
index b99b749d..b8d4519e 100644
--- a/platformapi/lakala/lakala_separate_accounts.go
+++ b/platformapi/lakala/lakala_separate_accounts.go
@@ -2,6 +2,7 @@ package lakala
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"git.rosy.net.cn/baseapi/utils"
 	"net/http"
@@ -203,7 +204,11 @@ func (a *API) QuerySeparateRecipient(orderNo, receiverNo string) (*QuerySeparate
 		return nil, err
 	}
 
-	bodyResult, err := json.Marshal(result)
+	if result["retCode"] != Success {
+		return nil, errors.New(result["retMsg"].(string))
+	}
+
+	bodyResult, err := json.Marshal(result["respData"])
 	if err != nil {
 		return nil, err
 	}
diff --git a/platformapi/lakala/lakala_separate_accounts_model.go b/platformapi/lakala/lakala_separate_accounts_model.go
index 45a5c506..0ffe4a2b 100644
--- a/platformapi/lakala/lakala_separate_accounts_model.go
+++ b/platformapi/lakala/lakala_separate_accounts_model.go
@@ -215,25 +215,25 @@ type QuerySeparateRecipientResp struct {
 	AcctOpenBankName           string `json:"acctOpenBankName"`           // 收款账户开户名称
 	AcctClearBankCode          string `json:"acctClearBankCode"`          // 收款账户清算行行号
 
-	//RowStatus         interface{} `json:"rowStatus"`
-	//RowSno            string      `json:"rowSno"`
-	//RowCreateUser     interface{} `json:"rowCreateUser"`
-	//RowCreateUserName string      `json:"rowCreateUserName"`
-	//RowCreateTm       time.Time   `json:"rowCreateTm"`
-	//RowModifyUser     interface{} `json:"rowModifyUser"`
-	//RowModifyUserName interface{} `json:"rowModifyUserName"`
-	//RowModifyTm       time.Time   `json:"rowModifyTm"`
-	//RowVerNo          interface{} `json:"rowVerNo"`
-	//Id                int         `json:"id"`
-	//SettlePeriod      interface{} `json:"settlePeriod"`
-	//SettleModel       interface{} `json:"settleModel"`
-	//ClearDt           interface{} `json:"clearDt"`
-	//OrgId             string      `json:"orgId"`
-	//OrgName           string      `json:"orgName"`
-	//OrgPath           string      `json:"orgPath"`
-	//ReceiverStatus    interface{} `json:"receiverStatus"`
-	//WalletId          string      `json:"walletId"`
-	//Remark            interface{} `json:"remark"`
+	RowStatus         interface{} `json:"rowStatus"`
+	RowSno            string      `json:"rowSno"`
+	RowCreateUser     interface{} `json:"rowCreateUser"`
+	RowCreateUserName string      `json:"rowCreateUserName"`
+	RowCreateTm       string      `json:"rowCreateTm"`
+	RowModifyUser     interface{} `json:"rowModifyUser"`
+	RowModifyUserName interface{} `json:"rowModifyUserName"`
+	RowModifyTm       string      `json:"rowModifyTm"`
+	RowVerNo          interface{} `json:"rowVerNo"`
+	Id                int         `json:"id"`
+	SettlePeriod      interface{} `json:"settlePeriod"`
+	SettleModel       interface{} `json:"settleModel"`
+	ClearDt           interface{} `json:"clearDt"`
+	OrgId             string      `json:"orgId"`
+	OrgName           string      `json:"orgName"`
+	OrgPath           string      `json:"orgPath"`
+	ReceiverStatus    interface{} `json:"receiverStatus"`
+	WalletId          string      `json:"walletId"`
+	Remark            interface{} `json:"remark"`
 }
 
 // SeparateApplyBindReq 分账关系申请绑定
diff --git a/platformapi/lakala/lakala_separate_accounts_test.go b/platformapi/lakala/lakala_separate_accounts_test.go
index 9dfe99c8..38e51609 100644
--- a/platformapi/lakala/lakala_separate_accounts_test.go
+++ b/platformapi/lakala/lakala_separate_accounts_test.go
@@ -29,16 +29,15 @@ func TestCreateSeparate(t *testing.T) {
 
 func TestGetSeparate(t *testing.T) {
 	paramter := &SeparateQueryReq{
-		Version:    "1.0",
-		OrderNo:    "KFPT20230223181747812863750",
-		OrgCode:    "1",
-		MerInnerNo: "822*********",
-		MerCupNo:   "",
+		Version:  Version2,
+		OrderNo:  "KFPT20230223181747812863750",
+		OrgCode:  "983931",
+		MerCupNo: "822651059990E0M",
 	}
 
 	api.SeparateQuery(paramter)
 }
 
 func TestQuerySeparateRecipient(t *testing.T) {
-	api.QuerySeparateRecipient("NEWRETAILSPLIT26687958", "4002022021832894453")
+	api.QuerySeparateRecipient("SR20240010115366", "SR2024000115366")
 }