From 81f5bcc51abe6389baa23854d64d47d3216fc5a6 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 13 May 2021 17:21:02 +0800
Subject: [PATCH] aa

---
 platformapi/jdapi/store.go      | 42 ++++++++++++++++++++++++++-------
 platformapi/jdapi/store_test.go |  2 +-
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/platformapi/jdapi/store.go b/platformapi/jdapi/store.go
index b0523cac..475a4852 100644
--- a/platformapi/jdapi/store.go
+++ b/platformapi/jdapi/store.go
@@ -2,6 +2,7 @@ package jdapi
 
 // todo 没有删除门店的方法？
 import (
+	"encoding/json"
 	"git.rosy.net.cn/baseapi/utils"
 )
 
@@ -478,13 +479,36 @@ func parsePrivilegeSearchUser(data map[string]interface{}) (innerData interface{
 	return innerData, err
 }
 
-func (a *API) QueryMerchantMemberInfo(vendorOrgCode string) (deliveryRange *StoreDeliveryRange, err error) {
-	jdParams := map[string]interface{}{
-		"orgCode": vendorOrgCode,
-	}
-	result, err := a.AccessAPI2("member/queryMerchantMemberInfo", jdParams, "")
-	if err == nil {
-		err = JdMap2StructByJson(result, &deliveryRange, false)
-	}
-	return deliveryRange, err
+type GetCommonMemberRegisteredInfoResult struct {
+	Result struct {
+		Birthday       interface{} `json:"birthday"`
+		Usersex        interface{} `json:"userSex"`
+		Address        interface{} `json:"address"`
+		Orderid        string      `json:"orderId"`
+		Userfullname   interface{} `json:"userFullName"`
+		Username       interface{} `json:"userName"`
+		Storeid        int         `json:"storeId"`
+		Userage        interface{} `json:"userAge"`
+		Timestamp      string      `json:"timeStamp"`
+		Phonenumber    string      `json:"phoneNumber"`
+		Identitytype   interface{} `json:"identityType"`
+		Identitynumber interface{} `json:"identityNumber"`
+		Orgcode        string      `json:"orgCode"`
+		Userfamilyname interface{} `json:"userFamilyname"`
+	} `json:"result"`
+	Msg     string      `json:"msg"`
+	Code    string      `json:"code"`
+	Success bool        `json:"success"`
+	Detail  interface{} `json:"detail"`
+}
+
+func (a *API) GetCommonMemberRegisteredInfo(orderId string) (getCommonMemberRegisteredInfoResult *GetCommonMemberRegisteredInfoResult, err error) {
+	jdParams := map[string]interface{}{
+		"orderId": orderId,
+	}
+	result, err := a.AccessAPI2("member/getCommonMemberRegisteredInfo", jdParams, "")
+	if err == nil {
+		json.Unmarshal([]byte(result["data"].(string)), &getCommonMemberRegisteredInfoResult)
+	}
+	return getCommonMemberRegisteredInfoResult, err
 }
diff --git a/platformapi/jdapi/store_test.go b/platformapi/jdapi/store_test.go
index d91c15d5..619fdd64 100644
--- a/platformapi/jdapi/store_test.go
+++ b/platformapi/jdapi/store_test.go
@@ -151,7 +151,7 @@ func TestGetDeliveryRangeByStationNo(t *testing.T) {
 }
 
 func TestQueryMerchantMemberInfo(t *testing.T) {
-	result, err := api.QueryMerchantMemberInfo("320406")
+	result, err := api.GetCommonMemberRegisteredInfo("562012843072000442")
 	if err != nil {
 		t.Fatal(err)
 	}