From 2ed41dae8c2bbc40f3fe0d522d5b71a622fa8e53 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Mon, 12 Dec 2022 10:29:33 +0800
Subject: [PATCH] setfence

---
 .../purchase/tiktok_store/transport.go        |  1 +
 .../tiktok_store/transport_callback.go        |  9 ++++
 .../purchase/tiktok_store/warehouse.go        | 42 +++++++++++--------
 3 files changed, 35 insertions(+), 17 deletions(-)
 create mode 100644 business/partner/purchase/tiktok_store/transport.go
 create mode 100644 business/partner/purchase/tiktok_store/transport_callback.go

diff --git a/business/partner/purchase/tiktok_store/transport.go b/business/partner/purchase/tiktok_store/transport.go
new file mode 100644
index 000000000..ef32b7246
--- /dev/null
+++ b/business/partner/purchase/tiktok_store/transport.go
@@ -0,0 +1 @@
+package tiktok_store
diff --git a/business/partner/purchase/tiktok_store/transport_callback.go b/business/partner/purchase/tiktok_store/transport_callback.go
new file mode 100644
index 000000000..c54a3e7c8
--- /dev/null
+++ b/business/partner/purchase/tiktok_store/transport_callback.go
@@ -0,0 +1,9 @@
+package tiktok_store
+
+type TransportCallbackResp struct {
+	Tag   string `json:"tag"`
+	MsgID string `json:"msgID"`
+}
+
+type ShipmentInfo struct {
+}
diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go
index 8341e4474..67abf66c9 100644
--- a/business/partner/purchase/tiktok_store/warehouse.go
+++ b/business/partner/purchase/tiktok_store/warehouse.go
@@ -122,7 +122,7 @@ func CreateFenceByStore(appOrgCode string, storeID int64) (fenceID string, err e
 	} else {
 		return "", fmt.Errorf("storeID必填")
 	}
-	if err = dao.GetRow(db, &localStore, sqlStr, sqlParam...); err == nil {
+	if err = dao.GetRow(db, &localStore, sqlStr, sqlParam); err == nil {
 		if localStore.DeliveryRangeType == LocalShapeCircular {
 			param = &warehouse_createFence_request.WarehouseCreateFenceParam{
 				FenceInfo: &warehouse_createFence_request.FenceInfo{
@@ -177,6 +177,7 @@ func UpdateFenceByStore(appOrgCode, outFenceID string, storeID int) error {
 		db         *dao.DaoDB
 		localStore *LocalStore
 		vertex     []warehouse_setFence_request.VerticesItem
+		param      = &warehouse_setFence_request.WarehouseSetFenceParam{}
 	)
 	sqlParam := []interface{}{}
 	sqlStr := `SELECT t.lng,t.lat,t.delivery_range_type,t.delivery_range FROM store t`
@@ -186,23 +187,22 @@ func UpdateFenceByStore(appOrgCode, outFenceID string, storeID int) error {
 	} else {
 		return fmt.Errorf("storeID必填")
 	}
-	if err := dao.GetRow(db, &localStore, sqlStr, sqlParam...); err == nil {
-		param := &warehouse_setFence_request.WarehouseSetFenceParam{
-			FenceInfo: &warehouse_setFence_request.FenceInfo{
-				OutFenceId: outFenceID,
-				Shape:      int32(localStore.DeliveryRangeType),
-			},
-		}
-		if localStore.DeliveryRangeType == tiktok_api.ShapeCircular {
-			circular := &warehouse_setFence_request.Circular{
-				Center: &warehouse_setFence_request.Center{
-					Longitude: float64(localStore.Lng) / float64(1000000),
-					Latitude:  float64(localStore.Lat) / float64(1000000),
+	if err := dao.GetRow(db, &localStore, sqlStr, sqlParam); err == nil {
+		if localStore.DeliveryRangeType == LocalShapeCircular {
+			param = &warehouse_setFence_request.WarehouseSetFenceParam{
+				FenceInfo: &warehouse_setFence_request.FenceInfo{
+					OutFenceId: outFenceID,
+					Shape:      tiktok_api.ShapeCircular,
+					Circular: &warehouse_setFence_request.Circular{
+						Center: &warehouse_setFence_request.Center{
+							Longitude: float64(localStore.Lng) / float64(1000000),
+							Latitude:  float64(localStore.Lat) / float64(1000000),
+						},
+						Radius: utils.Str2Float64(localStore.DeliveryRange),
+					},
 				},
-				Radius: utils.Str2Float64(localStore.DeliveryRange),
 			}
-			param.FenceInfo.Circular = circular
-		} else if localStore.DeliveryRangeType == tiktok_api.ShapePolygon {
+		} else if localStore.DeliveryRangeType == LocalShapePolygon {
 			tempStr := strings.Split(localStore.DeliveryRange, ";")
 			for v := len(tempStr) - 1; v >= 0; v-- {
 				s2 := strings.Split(tempStr[v], ",")
@@ -212,7 +212,15 @@ func UpdateFenceByStore(appOrgCode, outFenceID string, storeID int) error {
 				}
 				vertex = append(vertex, vertices)
 			}
-			param.FenceInfo.Polygon.Vertices = vertex
+			param = &warehouse_setFence_request.WarehouseSetFenceParam{
+				FenceInfo: &warehouse_setFence_request.FenceInfo{
+					OutFenceId: outFenceID,
+					Shape:      tiktok_api.ShapePolygon,
+					Polygon: &warehouse_setFence_request.Polygon{
+						Vertices: vertex,
+					},
+				},
+			}
 		}
 		if err := getAPI(appOrgCode, 0, "").SetFence(param); err != nil {
 			return err