增加地址解析

common_fun/file_func.go

@@ -0,0 +1,35 @@
+package cf
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+)
+
+// EnsureDirExists 确保目录存在，如果不存在则创建
+func EnsureDirExists(dirPath string) error {
+	// 判断路径是否存在
+	_, err := os.Stat(dirPath)
+	if os.IsNotExist(err) {
+		// 目录不存在，递归创建
+		err = os.MkdirAll(dirPath, os.ModePerm)
+		if err != nil {
+			return fmt.Errorf("创建目录失败，目录：%s，err： %w", dirPath, err)
+		}
+	} else if err != nil {
+		// 其他错误（如权限问题）
+		return fmt.Errorf("检查目录失败，目录：%s，err： %w", dirPath, err)
+	}
+	return nil
+}
+
+// EnsureParentDirExists 确保文件的目录存在，如果不存在则创建
+func EnsureParentDirExists(filePath string) error {
+	// 提取父级目录路径
+	dir := filepath.Dir(filePath)
+	err := EnsureDirExists(dir)
+	if err != nil {
+		return err
+	}
+	return nil
+}

common_fun/file_func_test.go

@@ -0,0 +1,19 @@
+package cf
+
+import "testing"
+
+func TestEnsureDirExists(t *testing.T) {
+	url := "/test"
+	err := EnsureDirExists(url)
+	if err != nil {
+		t.Errorf("EnsureDirExists() error = %v", err)
+	}
+}
+
+func TestEnsureParentDirExists(t *testing.T) {
+	filePath := "/test/test1/test.txt"
+	err := EnsureParentDirExists(filePath)
+	if err != nil {
+		t.Errorf("EnsureDirExists() error = %v", err)
+	}
+}

go.mod

@@ -1,12 +1,15 @@
 module git.ssgfgtfy.com/public/ssgf_utils
 
-go 1.18.0
+go 1.23.0
+
+toolchain go1.24.0
 
 require (
 	github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.7
 	github.com/alibabacloud-go/dysmsapi-20170525/v5 v5.1.1
 	github.com/alibabacloud-go/tea v1.3.8
 	github.com/alibabacloud-go/tea-utils/v2 v2.0.7
+	github.com/aliyun/alibabacloud-oss-go-sdk-v2 v1.2.3
 	github.com/pkg/errors v0.9.1
 	github.com/redis/go-redis/v9 v9.10.0
 	github.com/stretchr/testify v1.10.0
@@ -27,7 +30,8 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/tjfoc/gmsm v1.4.1 // indirect
-	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/net v0.41.0 // indirect
+	golang.org/x/time v0.4.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -44,13 +44,17 @@ github.com/alibabacloud-go/tea-utils/v2 v2.0.6/go.mod h1:qxn986l+q33J5VkialKMqT/
 github.com/alibabacloud-go/tea-utils/v2 v2.0.7 h1:WDx5qW3Xa5ZgJ1c8NfqJkF6w+AU5wB8835UdhPr6Ax0=
 github.com/alibabacloud-go/tea-utils/v2 v2.0.7/go.mod h1:qxn986l+q33J5VkialKMqT/TTs3E+U9MJpd001iWQ9I=
 github.com/alibabacloud-go/tea-xml v1.1.3/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8=
+github.com/aliyun/alibabacloud-oss-go-sdk-v2 v1.2.3 h1:LyeTJauAchnWdre3sAyterGrzaAtZ4dSNoIvDvaWfo4=
+github.com/aliyun/alibabacloud-oss-go-sdk-v2 v1.2.3/go.mod h1:FTzydeQVmR24FI0D6XWUOMKckjXehM/jgMn1xC+DA9M=
 github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6qTJya2bDq4X1Tw=
 github.com/aliyun/credentials-go v1.3.1/go.mod h1:8jKYhQuDawt8x2+fusqa1Y6mPxemTsBEN04dgcAcYz0=
 github.com/aliyun/credentials-go v1.3.6/go.mod h1:1LxUuX7L5YrZUWzBrRyk0SwSdH4OmPrib8NVePL3fxM=
 github.com/aliyun/credentials-go v1.4.5 h1:O76WYKgdy1oQYYiJkERjlA2dxGuvLRrzuO2ScrtGWSk=
 github.com/aliyun/credentials-go v1.4.5/go.mod h1:Jm6d+xIgwJVLVWT561vy67ZRP4lPTQxMbEYRuT2Ti1U=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -169,8 +173,9 @@ golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
 golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -223,6 +228,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY=
+golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

gps_tool/an_na_qi_client.go

@@ -16,13 +16,13 @@ import (
 
 type AnNaQiGpsClient struct {
 	AppCode string
-	Host    string
+	host    string
 }
 
 func NewAnNaQiGpsClient(appCode string) *AnNaQiGpsClient {
 	return &AnNaQiGpsClient{
 		AppCode: appCode,
-		Host:    "https://jmgeocode.market.alicloudapi.com",
+		host:    "https://jmgeocode.market.alicloudapi.com",
 	}
 }
 
@@ -32,7 +32,7 @@ func (n *AnNaQiGpsClient) GetGpsInfo(longitude, latitude float64) (res *AddressC
 	location := lo + "," + la
 	// 拼接URL
 	var fullURL string
-	fullURL, err = url.JoinPath(n.Host, "geocode/regeo_query")
+	fullURL, err = url.JoinPath(n.host, "geocode/regeo_query")
 	if err != nil {
 		return nil, errors.Wrapf(err, "获取gps:%s信息失败，拼接路径错误", location)
 	}
@@ -56,6 +56,9 @@ func (n *AnNaQiGpsClient) GetGpsInfo(longitude, latitude float64) (res *AddressC
 	if err != nil {
 		return nil, errors.Wrapf(err, "获取gps:%s信息失败，发送请求失败", location)
 	}
+	if resp.StatusCode != http.StatusOK {
+		return nil, errors.New(fmt.Sprintf("获取gps:%s信息失败，%+v", location, resp.Status))
+	}
 	defer func(Body io.ReadCloser) {
 		err = Body.Close()
 		if err != nil {
@@ -76,67 +79,67 @@ func (n *AnNaQiGpsClient) GetGpsInfo(longitude, latitude float64) (res *AddressC
 		return nil, errors.Wrapf(err, "获取gps:%s信息失败，解析JSON响应失败，%s", location, string(body))
 	}
 	// 检查API返回状态
-	if apiResult.Code != 200 {
-		return nil, errors.New(fmt.Sprintf("获取gps:%s信息失败，%+v", location, apiResult))
-	}
-
+	if apiResult.Code == 200 {
 		if len(apiResult.Data.Regeocodes) > 0 {
 			return &apiResult.Data.Regeocodes[0].AddressComponent, nil
 		}
+	}
+
 	return nil, errors.New(fmt.Sprintf("获取gps:%s信息失败，%+v", location, apiResult))
 }
 
-type ApiResult struct {
-	Data    Data   `json:"data"`
-	Msg     string `json:"msg"`
-	Success bool   `json:"success"`
-	Code    int    `json:"code"`
-	TaskNo  string `json:"taskNo"`
-}
+func (n *AnNaQiGpsClient) GetLocation(city, region, address string) (res []*Geocode, err error) {
+	values := url.Values{}
+	values.Set("city", city)
+	values.Set("address", region+address)
 
-type Data struct {
-	Regeocodes []Regeocode `json:"regeocodes"`
-}
+	// 创建请求
+	var req *http.Request
+	req, err = http.NewRequest(http.MethodPost, n.host+"/geocode/geo/query", bytes.NewBuffer([]byte(values.Encode())))
+	if err != nil {
+		return nil, errors.Wrapf(err, "获取经纬度失败，创建请求失败")
+	}
+	// 设置请求头
+	req.Header.Add("Authorization", "APPCODE "+n.AppCode)
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
 
-type Regeocode struct {
-	FormattedAddress string           `json:"formatted_address"`
-	AddressComponent AddressComponent `json:"addressComponent"`
-}
+	// 发送请求
+	// 创建HTTP客户端
+	client := &http.Client{}
+	client.Timeout = 5 * time.Second
+	var resp *http.Response
+	resp, err = client.Do(req)
+	if err != nil {
+		return nil, errors.Wrapf(err, "获取经纬度失败，发送请求失败")
+	}
+	if resp.StatusCode != http.StatusOK {
+		return nil, errors.New(fmt.Sprintf("获取经纬度失败，%+v", resp.Status))
+	}
+	defer func(Body io.ReadCloser) {
+		err = Body.Close()
+		if err != nil {
+			log.Printf("关闭获取经纬度响应体失败: %+v\n", err)
+		}
+	}(resp.Body)
+	// 读取响应体
+	var body []byte
+	body, err = io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, errors.Wrapf(err, "获取经纬度失败，读取响应体失败")
+	}
 
-type AddressComponent struct {
-	// BusinessAreas []interface{} `json:"businessAreas"`
-	Country  string `json:"country"`
-	Province string `json:"province"`
-	Citycode string `json:"citycode"`
-	City     string `json:"city"`
-	Adcode   string `json:"adcode"`
-	// StreetNumber StreetNumber `json:"streetNumber"`
-	// Towncode string `json:"towncode"`
-	// District string `json:"district"`
-	// Neighborhood  Neighborhood  `json:"neighborhood"`
-	// Township string `json:"township"`
-	// Building      Building      `json:"building"`
-}
+	// 解析JSON响应
+	var locationInfo LocationInfo
+	err = json.Unmarshal(body, &locationInfo)
+	if err != nil {
+		return nil, errors.Wrapf(err, "获取经纬度失败，解析JSON响应失败，%s", string(body))
+	}
+	// 检查API返回状态
+	if locationInfo.Code == 200 {
+		if locationInfo.Data.Count > 0 {
+			return locationInfo.Data.Geocodes, nil
+		}
+	}
 
-type BusinessArea struct {
-	Name     string `json:"name"`
-	Location string `json:"location"`
-	Id       string `json:"id"`
-}
-type StreetNumber struct {
-	Number    string `json:"number"`
-	Distance  string `json:"distance"`
-	Street    string `json:"street"`
-	Location  string `json:"location"`
-	Direction string `json:"direction"`
-}
-
-type Neighborhood struct {
-	Name interface{} `json:"name"`
-	Type interface{} `json:"type"`
-}
-
-type Building struct {
-	Name interface{} `json:"name"`
-	Type interface{} `json:"type"`
+	return nil, errors.New(fmt.Sprintf("获取经纬度失败，%+v", locationInfo.Msg))
 }

gps_tool/an_na_qi_client_test.go

@@ -2,6 +2,7 @@ package gps_tool
 
 import (
 	"log"
+	"reflect"
 	"testing"
 )
 
@@ -25,7 +26,6 @@ func TestAnNaQiGpsClient_GetGpsInfo(t *testing.T) {
 			name: "test1",
 			fields: fields{
 				AppCode: "",
-				Host:    "https://jmgeocode.market.alicloudapi.com",
 			},
 			args: args{
 				longitude: 113.419152,
@@ -37,7 +37,6 @@ func TestAnNaQiGpsClient_GetGpsInfo(t *testing.T) {
 			name: "test2",
 			fields: fields{
 				AppCode: "",
-				Host:    "https://jmgeocode.market.alicloudapi.com",
 			},
 			args: args{
 				longitude: 110.165223,
@@ -48,7 +47,6 @@ func TestAnNaQiGpsClient_GetGpsInfo(t *testing.T) {
 			name: "test2",
 			fields: fields{
 				AppCode: "",
-				Host:    "https://jmgeocode.market.alicloudapi.com",
 			},
 			args: args{
 				longitude: 115.928973,
@@ -60,7 +58,6 @@ func TestAnNaQiGpsClient_GetGpsInfo(t *testing.T) {
 			name: "test3",
 			fields: fields{
 				AppCode: "",
-				Host:    "https://jmgeocode.market.alicloudapi.com",
 			},
 			args: args{
 				longitude: 107.397284,
@@ -72,7 +69,6 @@ func TestAnNaQiGpsClient_GetGpsInfo(t *testing.T) {
 			name: "test4",
 			fields: fields{
 				AppCode: "",
-				Host:    "https://jmgeocode.market.alicloudapi.com",
 			},
 			args: args{
 				longitude: 115.929015,
@@ -84,7 +80,6 @@ func TestAnNaQiGpsClient_GetGpsInfo(t *testing.T) {
 			name: "test5",
 			fields: fields{
 				AppCode: "",
-				Host:    "https://jmgeocode.market.alicloudapi.com",
 			},
 			args: args{
 				longitude: 115.929100,
@@ -96,7 +91,6 @@ func TestAnNaQiGpsClient_GetGpsInfo(t *testing.T) {
 			name: "test6",
 			fields: fields{
 				AppCode: "",
-				Host:    "https://jmgeocode.market.alicloudapi.com",
 			},
 			args: args{
 				longitude: 126.587051,
@@ -108,7 +102,6 @@ func TestAnNaQiGpsClient_GetGpsInfo(t *testing.T) {
 			name: "test7",
 			fields: fields{
 				AppCode: "",
-				Host:    "https://jmgeocode.market.alicloudapi.com",
 			},
 			args: args{
 				longitude: 126.595051,
@@ -120,7 +113,6 @@ func TestAnNaQiGpsClient_GetGpsInfo(t *testing.T) {
 			name: "test8",
 			fields: fields{
 				AppCode: "",
-				Host:    "https://jmgeocode.market.alicloudapi.com",
 			},
 			args: args{
 				longitude: 125.342693,
@@ -132,7 +124,6 @@ func TestAnNaQiGpsClient_GetGpsInfo(t *testing.T) {
 			name: "test9",
 			fields: fields{
 				AppCode: "",
-				Host:    "https://jmgeocode.market.alicloudapi.com",
 			},
 			args: args{
 				longitude: 112.485550,
@@ -144,7 +135,6 @@ func TestAnNaQiGpsClient_GetGpsInfo(t *testing.T) {
 			name: "test10",
 			fields: fields{
 				AppCode: "",
-				Host:    "https://jmgeocode.market.alicloudapi.com",
 			},
 			args: args{
 				longitude: 115.928821,
@@ -156,7 +146,6 @@ func TestAnNaQiGpsClient_GetGpsInfo(t *testing.T) {
 			name: "test11",
 			fields: fields{
 				AppCode: "",
-				Host:    "https://jmgeocode.market.alicloudapi.com",
 			},
 			args: args{
 				longitude: 115.928821,
@@ -166,12 +155,55 @@ func TestAnNaQiGpsClient_GetGpsInfo(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			n := &AnNaQiGpsClient{
-				AppCode: tt.fields.AppCode,
-				Host:    tt.fields.Host,
-			}
+			n := NewAnNaQiGpsClient(tt.fields.AppCode)
 			gotRes, err := n.GetGpsInfo(tt.args.longitude, tt.args.latitude)
 			log.Println(gotRes, err)
 		})
 	}
 }
+
+func TestAnNaQiGpsClient_GetLocation(t *testing.T) {
+	type fields struct {
+		AppCode string
+		Host    string
+	}
+	type args struct {
+		city    string
+		region  string
+		address string
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		wantRes *[]Geocode
+		wantErr bool
+	}{
+		{
+			name: "奥园城市天地",
+			fields: fields{
+				AppCode: "",
+			},
+			args: args{
+				city:    "广州",
+				region:  "番禺",
+				address: "奥园城市天地9区2栋",
+			},
+			wantRes: nil,
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			n := NewAnNaQiGpsClient(tt.fields.AppCode)
+			gotRes, err := n.GetLocation(tt.args.city, tt.args.region, tt.args.address)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("GetLocation() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(gotRes, tt.wantRes) {
+				t.Errorf("GetLocation() gotRes = %v, want %v", gotRes, tt.wantRes)
+			}
+		})
+	}
+}

gps_tool/response.go

@@ -0,0 +1,81 @@
+package gps_tool
+
+type ApiResult struct {
+	Data    Data   `json:"data"`
+	Msg     string `json:"msg"`
+	Success bool   `json:"success"`
+	Code    int    `json:"code"`
+	TaskNo  string `json:"taskNo"`
+}
+
+type Data struct {
+	Regeocodes []Regeocode `json:"regeocodes"`
+}
+
+type Regeocode struct {
+	FormattedAddress string           `json:"formatted_address"`
+	AddressComponent AddressComponent `json:"addressComponent"`
+}
+
+type AddressComponent struct {
+	// BusinessAreas []interface{} `json:"businessAreas"`
+	Country  string `json:"country"`
+	Province string `json:"province"`
+	Citycode string `json:"citycode"`
+	City     string `json:"city"`
+	Adcode   string `json:"adcode"`
+	// StreetNumber StreetNumber `json:"streetNumber"`
+	// Towncode string `json:"towncode"`
+	// District string `json:"district"`
+	// Neighborhood  Neighborhood  `json:"neighborhood"`
+	// Township string `json:"township"`
+	// Building      Building      `json:"building"`
+}
+
+type BusinessArea struct {
+	Name     string `json:"name"`
+	Location string `json:"location"`
+	Id       string `json:"id"`
+}
+type StreetNumber struct {
+	Number    string `json:"number"`
+	Distance  string `json:"distance"`
+	Street    string `json:"street"`
+	Location  string `json:"location"`
+	Direction string `json:"direction"`
+}
+
+type Neighborhood struct {
+	Name interface{} `json:"name"`
+	Type interface{} `json:"type"`
+}
+
+type Building struct {
+	Name interface{} `json:"name"`
+	Type interface{} `json:"type"`
+}
+
+type LocationInfo struct {
+	Data    LocationDatum `json:"data"`
+	Msg     string        `json:"msg"`
+	Success bool          `json:"success"`
+	Code    int           `json:"code"`
+	TaskNo  string        `json:"taskNo"`
+}
+
+type LocationDatum struct {
+	Count    int        `json:"count"`
+	Geocodes []*Geocode `json:"geocodes"`
+}
+
+type Geocode struct {
+	Country          string `json:"country"`
+	FormattedAddress string `json:"formatted_address"`
+	City             string `json:"city"`
+	Adcode           string `json:"adcode"`
+	Level            string `json:"level"`
+	Province         string `json:"province"`
+	Citycode         string `json:"citycode"`
+	District         string `json:"district"`
+	Location         string `json:"location"`
+}

ip_tool/hua_chen_client.go

@@ -114,7 +114,7 @@ func (h *HuaChenIpClient) GetIpInfoFormCache(ctx context.Context, ip string, opt
 		return nil, errors.Wrapf(err, "无法将IP信息转换为JSON，ip:%s", ip)
 	}
 
-	if len(opt) == 0 {
+	if len(opt) != 0 {
 		err = h.cache.Set(ctx, h.ipKey(ip), string(infoJson), opt[0])
 		if err != nil {
 			return nil, errors.Wrapf(err, "缓存ip:%s信息失败，", ip)

jtt_tool/jtt_client.go

@@ -0,0 +1,201 @@
+package jtt_tool
+
+import (
+	"bytes"
+	"crypto"
+	"crypto/md5"
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/json"
+	"encoding/pem"
+	"fmt"
+	"github.com/pkg/errors"
+	"io"
+	"log"
+	"net/http"
+	"reflect"
+	"sort"
+	"strings"
+	"time"
+)
+
+type JttClient struct {
+	AppId      string
+	ApiUrl     string
+	PublicKey  string
+	PrivateKey string
+}
+
+func NewJttClient(appId, apiUrl, publicKey, privateKey string) *JttClient {
+	return &JttClient{
+		AppId:      appId,
+		ApiUrl:     apiUrl,
+		PublicKey:  publicKey,
+		PrivateKey: privateKey,
+	}
+}
+
+func (j *JttClient) FindUserForTokenMessage(address string) (res *FindUserForTokenMessageRes, err error) {
+	if address == "" {
+		return nil, fmt.Errorf("address is empty")
+	}
+	fmt.Println("address", address)
+
+	paramMap := make(map[string]any)
+
+	paramMap["appId"] = j.AppId
+	paramMap["timestamp"] = time.Now().Unix()
+	paramMap["publicKey"] = j.PublicKey
+	paramMap["address"] = address
+
+	postRes, err := j.JttPost("/findUserForTokenMessage", paramMap)
+	if err != nil {
+		return
+	}
+
+	err = json.Unmarshal(postRes, &res)
+	if err != nil {
+		err = fmt.Errorf("转换FindUserForTokenMessageRes结构体失败: %s", string(postRes))
+		return
+	}
+
+	if res == nil || res.Code != 200 {
+		err = fmt.Errorf("查询交易所数据失败: %w, res: %+v , 地址:%s", err, res, address)
+		return
+	}
+
+	return
+
+}
+
+type FindUserForTokenMessageRes struct {
+	Code int   `json:"code"`
+	Data *Data `json:"data"`
+}
+
+type Data struct {
+	UserTokenList []*UserToken `json:"userTokenList"`
+}
+
+type UserToken struct {
+	Code          int     `json:"code"`
+	Mes           string  `json:"mes"`
+	TokenNum      float64 `json:"tokenNum"`
+	WalletAddress string  `json:"walletAddress"`
+}
+
+func (j *JttClient) JttPost(url string, paramMap map[string]any) (res []byte, err error) {
+
+	bodyByte, _ := json.Marshal(paramMap)
+
+	req, err := http.NewRequest(http.MethodPost, j.ApiUrl+url, bytes.NewBuffer(bodyByte))
+	if err != nil {
+		return
+	}
+
+	req.Header.Set("Content-Type", "application/json")
+	sign, err := j.ToSign(paramMap)
+	if err != nil {
+		return
+	}
+	paramMap["sign"] = sign
+
+	// 创建 HTTP 客户端
+	client := &http.Client{}
+
+	// 发送请求
+	resp, err := client.Do(req)
+	//log.Printf("WPSPost resp: %+v\n", resp)
+	if err != nil {
+		log.Printf("发送请求失败: %+v\n", err)
+		return
+	}
+	defer func(Body io.ReadCloser) {
+		_ = Body.Close()
+	}(resp.Body)
+
+	// 读取响应体
+	res, err = io.ReadAll(resp.Body)
+	if err != nil {
+		return
+	}
+
+	fmt.Printf("res: %s\n", string(res))
+
+	if !json.Valid(res) {
+		return nil, errors.New("响应体不是有效的JSON格式")
+	}
+
+	return
+}
+
+func (s *JttClient) ToSign(reqData map[string]interface{}) (sign []byte, errs error) {
+	sortedStr, err := s.GetSortedStr(reqData)
+	if err != nil {
+		return
+	}
+	privateKeyStr := "-----BEGIN PRIVATE KEY-----\r\n" + s.PrivateKey + "\r\n-----END PRIVATE KEY-----"
+	sign, err = s.Sign(sortedStr, privateKeyStr)
+	return
+}
+
+func (s *JttClient) Sign(signData string, privateKeyStr string) (sign []byte, errs error) {
+	hashedMessage := md5.Sum([]byte(signData))
+	if privateKeyStr == "" {
+		return nil, errors.New("private key is empty")
+	}
+
+	block, _ := pem.Decode([]byte(privateKeyStr))
+	privateKey, err := x509.ParsePKCS8PrivateKey(block.Bytes)
+	if err != nil {
+		return nil, err
+	}
+	sign, err = rsa.SignPKCS1v15(rand.Reader, privateKey.(*rsa.PrivateKey), crypto.MD5, hashedMessage[:])
+	if err != nil {
+		return nil, err
+	}
+	sign = []byte(base64.StdEncoding.EncodeToString(sign))
+	return
+}
+
+func (s *JttClient) GetSortedStr(data any) (str string, err error) {
+	tmp := map[string]interface{}{}
+	if reflect.ValueOf(data).Kind() == reflect.Struct {
+		jsStr, _ := json.Marshal(data)
+		_ = json.Unmarshal(jsStr, &tmp)
+	} else {
+		ok := false
+		tmp, ok = data.(map[string]interface{})
+		if !ok {
+			err = errors.New("data type error")
+		}
+	}
+
+	keys := []string{}
+	for key := range tmp {
+		keys = append(keys, key)
+	}
+
+	sort.Strings(keys)
+	sortedParams := []string{}
+
+	for _, key := range keys {
+		value := tmp[key]
+		if key == "sign" {
+			continue
+		}
+
+		switch v := value.(type) {
+		case int, uint, int16, int32, int64:
+			sortedParams = append(sortedParams, fmt.Sprintf("%s=%d", key, v))
+		case float64, float32:
+			sortedParams = append(sortedParams, fmt.Sprintf("%s=%f", key, v))
+		default:
+			sortedParams = append(sortedParams, key+"="+value.(string))
+		}
+	}
+	str = strings.Join(sortedParams, "&")
+	return
+}

jtt_tool/jtt_client_test.go

@@ -0,0 +1,51 @@
+package jtt_tool
+
+import (
+	"log"
+	"testing"
+)
+
+func TestJttClient_FindUserForTokenMessage(t *testing.T) {
+	type fields struct {
+		AppId      string
+		ApiUrl     string
+		PublicKey  string
+		PrivateKey string
+	}
+	type args struct {
+		address string
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		wantRes *FindUserForTokenMessageRes
+		wantErr bool
+	}{
+		{
+			name:   "test1",
+			fields: fields{},
+			args: args{
+				address: "0x123456",
+			},
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			h := &JttClient{
+				AppId:      test.fields.AppId,
+				ApiUrl:     test.fields.ApiUrl,
+				PublicKey:  test.fields.PublicKey,
+				PrivateKey: test.fields.PrivateKey,
+			}
+
+			gotRes, err := h.FindUserForTokenMessage(test.args.address)
+
+			log.Println(gotRes, err)
+
+			if (err != nil) != test.wantErr {
+				t.Errorf("FindUserForTokenMessage() error = %v, wantErr %v", err, test.wantErr)
+			}
+		})
+	}
+}

oss_tool/aliyun_oss.go

@@ -0,0 +1,190 @@
+package oss_tool
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	cf "git.ssgfgtfy.com/public/ssgf_utils/common_fun"
+	"github.com/aliyun/alibabacloud-oss-go-sdk-v2/oss"
+	"github.com/aliyun/alibabacloud-oss-go-sdk-v2/oss/credentials"
+	"image"
+	"image/jpeg"
+	"image/png"
+	"io"
+	"os"
+	"time"
+)
+
+type ALiYunOSSClient struct {
+	AccessKeyID     string
+	AccessKeySecret string
+	Region          string
+	ossClient       *oss.Client
+}
+
+// NewAliYunOSS 创建阿里云OSS客户端
+func (c *ALiYunOSSClient) NewAliYunOSS() (err error) {
+	if c.AccessKeyID == "" || c.AccessKeySecret == "" {
+		return errors.New("请配置 oss accessKeyID accessKeySecret")
+	}
+	if c.Region == "" {
+		return errors.New("请配置 oss region")
+	}
+	provider := credentials.NewStaticCredentialsProvider(c.AccessKeyID, c.AccessKeySecret)
+	cfg := oss.LoadDefaultConfig().WithSignatureVersion(oss.SignatureVersionV4).WithCredentialsProvider(provider).WithRegion(c.Region)
+	c.ossClient = oss.NewClient(cfg)
+	return nil
+}
+
+// BuildPutSignUrl 获取上传签名
+func (c *ALiYunOSSClient) BuildPutSignUrl(bucket string, key string, expires time.Duration) (result *oss.PresignResult, err error) {
+	// 生成PutObject的预签名URL
+	result, err = c.ossClient.Presign(
+		context.Background(),
+		&oss.PutObjectRequest{
+			Bucket: oss.Ptr(bucket),
+			Key:    oss.Ptr(key),
+		},
+		oss.PresignExpires(expires),
+	)
+	if err != nil {
+		return nil, err
+	}
+	return
+}
+
+// BuildPutSignUrlByPutObjectRequest 根据PutObjectRequest生成PutObject的预签名URL
+func (c *ALiYunOSSClient) BuildPutSignUrlByPutObjectRequest(req *oss.PutObjectRequest, expires time.Duration) (result *oss.PresignResult, err error) {
+	// 生成PutObject的预签名URL
+	result, err = c.ossClient.Presign(
+		context.Background(),
+		req,
+		oss.PresignExpires(expires),
+	)
+	if err != nil {
+		return nil, err
+	}
+	return
+}
+
+// BuildSignUrlByGetObjectRequest 根据GetObjectRequest生成GetObject的预签名URL
+func (c *ALiYunOSSClient) BuildSignUrlByGetObjectRequest(req *oss.GetObjectRequest) (result *oss.PresignResult, err error) {
+	// 生成PutObject的预签名URL
+	result, err = c.ossClient.Presign(
+		context.Background(),
+		req,
+	)
+	if err != nil {
+		return nil, err
+	}
+	return
+}
+
+// PutForLocalFile 上传本地文件
+func (c *ALiYunOSSClient) PutForLocalFile(bucket, key, path string) (result *oss.PutObjectResult, err error) {
+	// 创建上传对象的请求
+	putRequest := &oss.PutObjectRequest{
+		Bucket:       oss.Ptr(bucket),          // 存储空间名称
+		Key:          oss.Ptr(key),             // 对象名称
+		StorageClass: oss.StorageClassStandard, // 指定对象的存储类型为标准存储
+		ContentType:  oss.Ptr("application/octet-stream"),
+	}
+	// 执行上传对象的请求
+	result, err = c.ossClient.PutObjectFromFile(context.Background(), putRequest, path)
+	if err != nil {
+		return nil, err
+	}
+	return
+}
+
+// GetObject 下载文件,返回的是一个*oss.GetObjectResult （不推荐使用，如果使用的话，需要手动调用object.Body.Close()手动关闭资源）
+func (c *ALiYunOSSClient) GetObject(bucket string, key string) (object *oss.GetObjectResult, body io.ReadCloser, err error) {
+	getRequest := &oss.GetObjectRequest{
+		Bucket: oss.Ptr(bucket), // 存储空间名称
+		Key:    oss.Ptr(key),    // 对象名称
+	}
+	// 执行获取对象的操作并处理结果
+	result, err := c.ossClient.GetObject(context.TODO(), getRequest)
+	if err != nil {
+		return nil, nil, err
+	}
+	//defer func() {
+	//	_ = result.Body.Close() // 确保在函数结束时关闭响应体
+	//}()
+	return result, result.Body, nil
+}
+
+// GetObjectToFile 获取对象并保存到本地
+func (c *ALiYunOSSClient) GetObjectToFile(bucket string, key string, path string) (err error) {
+	getRequest := &oss.GetObjectRequest{
+		Bucket: oss.Ptr(bucket), // 存储空间名称
+		Key:    oss.Ptr(key),    // 对象名称
+	}
+	// 执行获取对象的操作并处理结果
+	result, err := c.ossClient.GetObject(context.TODO(), getRequest)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = result.Body.Close() // 确保在函数结束时关闭响应体
+	}()
+	// 确保文件目录存在
+	err = cf.EnsureParentDirExists(path)
+	if err != nil {
+		return err
+	}
+	// 创建目标文件
+	file, err := os.Create(path)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	// 将 reader 中的内容复制到文件中
+	_, err = io.Copy(file, result.Body)
+	return nil
+}
+
+// GetObjectToImage 获取对象并保存为图片对象
+func (c *ALiYunOSSClient) GetObjectToImage(bucket string, key string) (img image.Image, err error) {
+	getRequest := &oss.GetObjectRequest{
+		Bucket: oss.Ptr(bucket), // 存储空间名称
+		Key:    oss.Ptr(key),    // 对象名称
+	}
+	// 执行获取对象的操作并处理结果
+	result, err := c.ossClient.GetObject(context.TODO(), getRequest)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		_ = result.Body.Close() // 确保在函数结束时关闭响应体
+	}()
+	img, _, err = image.Decode(result.Body)
+	if err != nil {
+		// 尝试 JPEG 解码
+		img, err = jpeg.Decode(result.Body)
+		if err != nil {
+			// 尝试 PNG 解码
+			img, err = png.Decode(result.Body)
+			if err != nil {
+				return nil, fmt.Errorf("图片解码失败（支持的格式：JPEG/PNG）: %v", err)
+			}
+		}
+	}
+	return img, nil
+}
+
+// DelObject 删除对象
+func (c *ALiYunOSSClient) DelObject(bucket string, key string) (result *oss.DeleteObjectResult, err error) {
+	// 创建删除对象的请求
+	request := &oss.DeleteObjectRequest{
+		Bucket: oss.Ptr(bucket), // 存储空间名称
+		Key:    oss.Ptr(key),    // 对象名称
+	}
+	// 执行删除对象的操作并处理结果
+	result, err = c.ossClient.DeleteObject(context.TODO(), request)
+	if err != nil {
+		return nil, err
+	}
+	return result, err
+}

oss_tool/aliyun_oss_test.go

@@ -0,0 +1,120 @@
+package oss_tool
+
+import (
+	"github.com/aliyun/alibabacloud-oss-go-sdk-v2/oss"
+	"os"
+	"testing"
+)
+
+var (
+	accessKeyId     = os.Getenv("OSS_ACCESS_KEY_ID")
+	accessKeySecret = os.Getenv("OSS_SECRET_ACCESS_KEY")
+	region          = os.Getenv("OSS_REGION")
+	client          = &ALiYunOSSClient{
+		AccessKeyID:     accessKeyId,
+		AccessKeySecret: accessKeySecret,
+		Region:          region,
+	}
+)
+
+func TestALiYunOSSClient_NewAliYunOSS(t *testing.T) {
+	err := client.NewAliYunOSS()
+	if err != nil {
+		t.Error(err)
+	}
+	t.Log(client.ossClient)
+}
+
+func TestALiYunOSSClient_BuildPutSignUrl(t *testing.T) {
+	err := client.NewAliYunOSS()
+	if err != nil {
+		t.Error(err)
+	}
+	sign, err := client.BuildPutSignUrl("", "test/upload/bizhi1.jpg", 0)
+	if err != nil {
+		t.Error(err)
+	}
+	t.Log(sign)
+}
+
+func TestALiYunOSSClient_BuildPutSignUrlByPutObjectRequest(t *testing.T) {
+	err := client.NewAliYunOSS()
+	if err != nil {
+		t.Error(err)
+	}
+	req := &oss.PutObjectRequest{}
+	req.Bucket = oss.Ptr("")
+	req.Key = oss.Ptr("test/upload/bizhi2.jpg")
+	req.ContentType = oss.Ptr("application/octet-stream")
+	sign, err := client.BuildPutSignUrlByPutObjectRequest(req, 0)
+	if err != nil {
+		t.Error(err)
+	}
+	t.Log(sign)
+}
+
+func TestALiYunOSSClient_PutForLocalFile(t *testing.T) {
+	err := client.NewAliYunOSS()
+	if err != nil {
+		t.Error(err)
+	}
+	result, err := client.PutForLocalFile("ssgfdown", "test/upload/bizhi2.jpg", "")
+	if err != nil {
+		t.Error(err)
+	}
+	t.Log(result)
+}
+
+func TestALiYunOSSClient_BuildSignUrlByGetObjectRequest(t *testing.T) {
+	err := client.NewAliYunOSS()
+	if err != nil {
+		t.Error(err)
+	}
+	req := &oss.GetObjectRequest{}
+	req.Bucket = oss.Ptr("ssgfdown")
+	req.Key = oss.Ptr("test/upload/bizhi2.jpg")
+	result, err := client.BuildSignUrlByGetObjectRequest(req)
+	if err != nil {
+		t.Error(err)
+	}
+	t.Log(result)
+}
+
+func TestALiYunOSSClient_GetObjectToFile(t *testing.T) {
+	err := client.NewAliYunOSS()
+	if err != nil {
+		t.Error(err)
+	}
+	err = client.GetObjectToFile("", "test/upload/bizhi1.jpg", "D:/bizhi1.jpg")
+	if err != nil {
+		t.Error(err)
+	} else {
+		t.Log("成功")
+	}
+}
+
+func TestALiYunOSSClient_GetObjectToImage(t *testing.T) {
+	err := client.NewAliYunOSS()
+	if err != nil {
+		t.Error(err)
+	}
+	img, err := client.GetObjectToImage("", "test/upload/bizhi1.jpg")
+	if err != nil {
+		t.Error(err)
+	} else {
+		t.Log(img)
+	}
+}
+
+func TestALiYunOSSClient_DelObject(t *testing.T) {
+	err := client.NewAliYunOSS()
+	if err != nil {
+		t.Error(err)
+	}
+	res, err := client.DelObject("", "test/upload/bizhi2.jpg")
+	if err != nil {
+		t.Error(err)
+	} else {
+		t.Log(res)
+	}
+}

sms_tool/sms_client.go

@@ -38,7 +38,7 @@ func NewSmsClient(smsConfig *SmsConfig) (smsClient SmsClient, err error) {
 	config.AccessKeySecret = tea.String(smsConfig.AccessKeySecret)
 	// Endpoint 请参考 https://api.aliyun.com/product/Dysmsapi
 	config.Endpoint = tea.String(smsConfig.Endpoint)
-
+	smsClient.SmsConfig = *smsConfig
 	smsClient.client = &dysmsapi20170525.Client{}
 	smsClient.client, err = dysmsapi20170525.NewClient(config)
 	return smsClient, err

weipinshang/goods_api.go

@@ -105,3 +105,31 @@ func (c *WeiPinShangClient) GetGoodsStock(req GetGoodsStockReq) (*[]GoodsStock,
 	res := out.Data
 	return &res, err
 }
+
+func (c *WeiPinShangClient) GetSaleVenue(req GetSaleVenueReq) (*SaleVenueList, error) {
+	param := StructToMapString(req)
+	out := GetSaleVenueRes{}
+	err := c.PostAndParse(GetSaleVenueURL, param, &out)
+	if err != nil {
+		return nil, err
+	}
+	if out.Code != 0 {
+		return nil, fmt.Errorf(out.Msg)
+	}
+	res := out.Data
+	return &res, err
+}
+
+func (c *WeiPinShangClient) GetSaleVenueGoods(req GetSaleVenueGoodsReq) (*SaleVenueGoodsList, error) {
+	param := StructToMapString(req)
+	out := GetSaleVenueGoodsRes{}
+	err := c.PostAndParse(GetSaleVenueGoodsURL, param, &out)
+	if err != nil {
+		return nil, err
+	}
+	if out.Code != 0 {
+		return nil, fmt.Errorf(out.Msg)
+	}
+	res := out.Data
+	return &res, err
+}

weipinshang/goods_api_test.go

@@ -113,3 +113,31 @@ func TestGetGoodsStock(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, res)
 }
+
+func TestGetSaleVenue(t *testing.T) {
+	ts := setupMockServer(wps.GetSaleVenueURL, http.MethodPost, `{"code":200,"data":{"stocks":[]}}`, t)
+	defer ts.Close()
+
+	client := newClientWithServer(ts)
+	res, err := client.GetSaleVenue(wps.GetSaleVenueReq{
+		PageNo:   "1",
+		PageSize: "100",
+		Sort:     0,
+	})
+	assert.NoError(t, err)
+	assert.NotNil(t, res)
+}
+
+func TestGetSaleVenueGoods(t *testing.T) {
+	ts := setupMockServer(wps.GetSaleVenueGoodsURL, http.MethodPost, `{"code":200,"data":{"stocks":[]}}`, t)
+	defer ts.Close()
+
+	client := newClientWithServer(ts)
+	res, err := client.GetSaleVenueGoods(wps.GetSaleVenueGoodsReq{
+		PageNo:       "1",
+		PageSize:     "100",
+		ExhibitionID: "1829399501611053057",
+	})
+	assert.NoError(t, err)
+	assert.NotNil(t, res)
+}

weipinshang/model.go

@@ -169,10 +169,10 @@ type GoodsSkuItem struct {
 	CGoodsColor      string      `json:"c_goods_color"`       // 商品颜色
 	CGoodsSize       string      `json:"c_goods_size"`        // 商品尺寸
 	CGoodsImage      string      `json:"c_goods_image"`       // 商品列表图片
-	CGoodsStockStart int    `json:"c_goods_stock_start"` // 初始总库存
-	CGoodsStockValid int    `json:"c_goods_stock_valid"` // 有效库存（下单库存参考）
-	CBuyMinNum       int    `json:"c_buy_min_num"`       // 最小购买数量
-	CBuyMaxNum       int    `json:"c_buy_max_num"`       // 最大购买数量
+	CGoodsStockStart interface{} `json:"c_goods_stock_start"` // 初始总库存
+	CGoodsStockValid interface{} `json:"c_goods_stock_valid"` // 有效库存（下单库存参考）
+	CBuyMinNum       interface{} `json:"c_buy_min_num"`       // 最小购买数量
+	CBuyMaxNum       interface{} `json:"c_buy_max_num"`       // 最大购买数量
 }
 
 type GetGoodsDetailsReq struct {
@@ -199,3 +199,66 @@ type GoodsStock struct {
 	CGoodsId string `json:"c_goods_id"`
 	CStock   int    `json:"c_stock"`
 }
+
+type GetSaleVenueReq struct {
+	PageNo   string `json:"pageNo"`   //页码
+	PageSize string `json:"pageSize"` //条数
+	Sort     int    `json:"sort"`     //传1为c_id desc ,不传或者传0为c_start_datetime asc
+}
+
+type GetSaleVenueRes struct {
+	Code int64         `json:"code"` //返回编码[0为成功，其它为失败]
+	Msg  string        `json:"msg"`  //返回信息[请求接口消息]
+	Data SaleVenueList `json:"data"`
+}
+
+type SaleVenueList struct {
+	PageIndex string      `json:"pageIndex"`
+	PageCount int         `json:"pageCount"`
+	DataCount int         `json:"dataCount"`
+	List      []SaleVenue `json:"list"` // 会场列表
+}
+
+type SaleVenue struct {
+	CID             int    `json:"c_id"`               // 序号
+	CExhibitionID   string `json:"c_exhibition_id"`    // 会场ID
+	CBrandID        int    `json:"c_brand_id"`         // 品牌ID
+	CExhibitionName string `json:"c_exhibition_name"`  // 会场名称
+	CIconImageURL   string `json:"c_icon_image_url"`   // 会场列表图片
+	CBannerImageURL string `json:"c_banner_image_url"` // 会场Banner图
+	CDescription    string `json:"c_description"`      // 会场描述（可选）
+	CStartDatetime  string `json:"c_start_datetime"`   // 会场开始时间
+	CEndDatetime    string `json:"c_end_datetime"`     // 会场结束时间
+	CCompanyCode    string `json:"c_company_code"`     //供应商编号
+}
+
+type GetSaleVenueGoodsReq struct {
+	PageNo       string `json:"pageNo"`        //页码
+	PageSize     string `json:"pageSize"`      //条数
+	ExhibitionID string `json:"exhibition_id"` //会场id
+}
+
+type GetSaleVenueGoodsRes struct {
+	Code int64              `json:"code"` //返回编码[0为成功，其它为失败]
+	Msg  string             `json:"msg"`  //返回信息[请求接口消息]
+	Data SaleVenueGoodsList `json:"data"`
+}
+
+type SaleVenueGoodsList struct {
+	PageIndex string           `json:"pageIndex"`
+	PageCount int              `json:"pageCount"`
+	DataCount int              `json:"dataCount"`
+	List      []SaleVenueGoods `json:"list"` // 会场列表
+}
+
+type SaleVenueGoods struct {
+	CID               int    `json:"c_id"`                // 序号
+	CExhibitionID     string `json:"c_exhibition_id"`     // 商品所属会场 ID
+	CFatherGoodsID    string `json:"c_father_goods_id"`   // 商品编码
+	CGoodsName        string `json:"c_goods_name"`        // 商品名称
+	CGoodsImage       string `json:"c_goods_image"`       // 商品主图
+	CGoodsDescription string `json:"c_goods_description"` // 商品描述
+	CGoodsContent     string `json:"c_goods_content"`     // 商品详情图（可选）
+	CInPrice          string `json:"c_in_price"`          // 商品进价
+	COriginalPrice    string `json:"c_original_price"`    // 商品市场价（吊牌价）
+}

weipinshang/wei_pin_shang_client.go

@@ -29,6 +29,8 @@ const (
 	GetDetailsGoodsUrl   = "mcang/Mcang/getDetailsGoods"   //获取批量商品详情接口
 	GetGoodsDetailsURL   = "mcang/Mcang/getGoodsDetails"   //获取单个商品详情接口
 	GetGoodsStockURL     = "mcang/Mcang/getGoodsStock"     //获取单个商品详情接口
+	GetSaleVenueURL      = "mcang/Mcang/getSaleVenue"      //获取会场列表接口
+	GetSaleVenueGoodsURL = "mcang/Mcang/getSaleVenueGoods" //获取会场商品列表接口
 )
 
 // Config 客户端配置

weipinshang_api/res.go

@@ -28,7 +28,7 @@ type CreateOrderData struct {
 	ThirdOrderNo string      `json:"thirdOrderNo"` //  第三方订单号 本地订单号
 	OrderNo      string      `json:"orderNo"`      //   主订单号
 	McOrderNo    string      `json:"mcOrderNo"`    //蜜仓子订单号
-	OrderAmount  float64   `json:"orderAmount"`  // 	子订单总金额
+	OrderAmount  interface{} `json:"orderAmount"`  // 	子订单总金额
 	Sku          []SkuData   `json:"sku"`          // 订单商品信息
 }
 
@@ -38,7 +38,7 @@ type SkuData struct {
 	GoodName   string      `json:"goodName"`   //商品名称
 	Num        interface{} `json:"num"`        //数量
 	//Num   int    `json:"num"`   //数量
-	Price string `json:"price"` //单价
+	Price interface{} `json:"price"` //单价
 }
 
 type GetOrderInfoRes struct {