liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2024-05-31 13:34:11 +08:00
parent 165988ec58
commit d7263034f3
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/partner/delivery/fn/store.go
View File

@@ -42,8 +42,8 @@ func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.S
createStore := &fnpsapi.CreateStoreBaseInfo{ createStore := &fnpsapi.CreateStoreBaseInfo{
ContactPhone: storeDetail.Tel1, ContactPhone: storeDetail.Tel1,
Address: storeDetail.Address, Address: storeDetail.Address,
Longitude: utils.Int2Float64(storeDetail.Lng) / 1000000, Longitude: jxutils.IntCoordinate2Standard(storeDetail.Lng),
Latitude: utils.Int2Float64(storeDetail.Lat) / 1000000, Latitude: jxutils.IntCoordinate2Standard(storeDetail.Lat),
PositionSource: 3, PositionSource: 3,
OutShopCode: utils.Int2Str(storeDetail.ID), OutShopCode: utils.Int2Str(storeDetail.ID),
CategoryID: "51", CategoryID: "51",
@@ -119,8 +119,8 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S
ChainStoreID: fnStore.ChainStoreID, ChainStoreID: fnStore.ChainStoreID,
ContactPhone: storeDetail.Tel1, ContactPhone: storeDetail.Tel1,
Address: storeDetail.Address, Address: storeDetail.Address,
Longitude: utils.Int2Float64(storeDetail.Lng) / 1000000, Longitude: jxutils.IntCoordinate2Standard(storeDetail.Lng),
Latitude: utils.Int2Float64(storeDetail.Lat) / 1000000, Latitude: jxutils.IntCoordinate2Standard(storeDetail.Lat),
PositionSource: 3, PositionSource: 3,
OutShopCode: utils.Int2Str(storeDetail.ID), OutShopCode: utils.Int2Str(storeDetail.ID),
CategoryID: "51", CategoryID: "51",

8
business/partner/delivery/fn/waybill.go
View File

@@ -121,8 +121,8 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
OrderType: 1, OrderType: 1,
PositionSource: 3, PositionSource: 3,
ReceiverAddress: order.ConsigneeAddress, ReceiverAddress: order.ConsigneeAddress,
ReceiverLongitude: utils.Int2Float64(order.ConsigneeLng) / 1000000, ReceiverLongitude: jxutils.IntCoordinate2Standard(order.ConsigneeLng),
ReceiverLatitude: utils.Int2Float64(order.ConsigneeLat) / 1000000, ReceiverLatitude: jxutils.IntCoordinate2Standard(order.ConsigneeLat),
GoodsTotalAmountCent: order.SalePrice, GoodsTotalAmountCent: order.SalePrice,
GoodsActualAmountCent: order.ActualPayPrice, GoodsActualAmountCent: order.ActualPayPrice,
GoodsWeight: utils.Int2Float64(order.Weight) / 1000, GoodsWeight: utils.Int2Float64(order.Weight) / 1000,
@@ -198,8 +198,8 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
OrderType: 1, OrderType: 1,
PositionSource: 3, PositionSource: 3,
ReceiverAddress: order.ConsigneeAddress, ReceiverAddress: order.ConsigneeAddress,
ReceiverLongitude: utils.Int2Float64(order.ConsigneeLng) / 1000000, ReceiverLongitude: jxutils.IntCoordinate2Standard(order.ConsigneeLng),
ReceiverLatitude: utils.Int2Float64(order.ConsigneeLat) / 1000000, ReceiverLatitude: jxutils.IntCoordinate2Standard(order.ConsigneeLat),
GoodsTotalAmountCent: order.SalePrice, GoodsTotalAmountCent: order.SalePrice,
GoodsActualAmountCent: order.ActualPayPrice, GoodsActualAmountCent: order.ActualPayPrice,
GoodsWeight: utils.Int2Float64(order.Weight) / 1000, GoodsWeight: utils.Int2Float64(order.Weight) / 1000,

8
business/partner/delivery/rider.go
View File

@@ -658,15 +658,15 @@ func GetVendorRiderInfo(wayBillVendorId, vendorId int, vendorOrderId, vendorWayb
return nil, err return nil, err
} }
if order.Status >= model.OrderStatusEndBegin { if order.Status >= model.OrderStatusEndBegin {
riderInfo.Longitude = utils.Float64ToStr(utils.Int2Float64(order.ConsigneeLng) / 1000000) riderInfo.Longitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLng))
riderInfo.Latitude = utils.Float64ToStr(utils.Int2Float64(order.ConsigneeLat) / 1000000) riderInfo.Latitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLat))
} else { } else {
store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode) store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
if err != nil { if err != nil {
return nil, err return nil, err
} }
riderInfo.Longitude = utils.Float64ToStr(utils.Int2Float64(store.Lng) / 1000000) riderInfo.Longitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng))
riderInfo.Latitude = utils.Float64ToStr(utils.Int2Float64(store.Lat) / 1000000) riderInfo.Latitude = utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lat))
} }
} }

9
business/partner/purchase/tiktok_store/warehouse.go
View File

@@ -3,6 +3,7 @@ package tiktok_store
import ( import (
"errors" "errors"
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/business/jxutils"
"strconv" "strconv"
"strings" "strings"
@@ -133,8 +134,8 @@ func CreateFenceByStore(appOrgCode string, storeID int64) (fenceID string, err e
Shape: tiktok_api.ShapeCircular, Shape: tiktok_api.ShapeCircular,
Circular: &warehouse_createFence_request.Circular{ Circular: &warehouse_createFence_request.Circular{
Center: &warehouse_createFence_request.Center{ Center: &warehouse_createFence_request.Center{
Longitude: float64(localStore.Lng) / float64(1000000), Longitude: jxutils.IntCoordinate2Standard(localStore.Lng),
Latitude: float64(localStore.Lat) / float64(1000000), Latitude: jxutils.IntCoordinate2Standard(localStore.Lat),
}, },
Radius: utils.Str2Float64(localStore.DeliveryRange), Radius: utils.Str2Float64(localStore.DeliveryRange),
}, },
@@ -202,8 +203,8 @@ func UpdateFenceByStore(appOrgCode, outFenceID, storeID string) error {
Shape: tiktok_api.ShapeCircular, Shape: tiktok_api.ShapeCircular,
Circular: &warehouse_setFence_request.Circular{ Circular: &warehouse_setFence_request.Circular{
Center: &warehouse_setFence_request.Center{ Center: &warehouse_setFence_request.Center{
Longitude: float64(localStore.Lng) / float64(1000000), Longitude: jxutils.IntCoordinate2Standard(localStore.Lng),
Latitude: float64(localStore.Lat) / float64(1000000), Latitude: jxutils.IntCoordinate2Standard(localStore.Lat),
}, },
Radius: utils.Str2Float64(localStore.DeliveryRange), Radius: utils.Str2Float64(localStore.DeliveryRange),
}, },