This commit is contained in:
richboo111
2022-12-12 10:29:33 +08:00
parent dcf9a26971
commit 2ed41dae8c
3 changed files with 35 additions and 17 deletions

View File

@@ -0,0 +1 @@
package tiktok_store

View File

@@ -0,0 +1,9 @@
package tiktok_store
type TransportCallbackResp struct {
Tag string `json:"tag"`
MsgID string `json:"msgID"`
}
type ShipmentInfo struct {
}

View File

@@ -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