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-09-10 13:46:41 +08:00
parent cd3ee16ac2
commit e00e169cf8
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -384,10 +384,10 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) error
}
courierCoordinate := strings.Split(waybill2.CourierCoordinate, ",")
if len(courierCoordinate) < 2 && fakeWayBill.Status < model.WaybillStatusDelivered {
if waybill2.CourierCoordinate == "" && fakeWayBill.Status < model.WaybillStatusDelivered {
courierCoordinate = append(courierCoordinate, utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lng)), utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lat)))
}
if len(courierCoordinate) < 2 && fakeWayBill.Status >= model.WaybillStatusDelivered {
if waybill2.CourierCoordinate == "" && fakeWayBill.Status >= model.WaybillStatusDelivered {
courierCoordinate = append(courierCoordinate, utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLng)), utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLat)))
}
switch fakeWayBill.Status {

10
business/partner/delivery/rider_test.go
View File

@@ -1,19 +1,9 @@
package delivery
import (
"fmt"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"testing"
)
func TestRider(t *testing.T) {
GetOrderRiderInfoToPlatform("144228632526740576", 0)
}
func TestCcc(t *testing.T) {
aa := utils.Float64ToStr(jxutils.IntCoordinate2Standard(103989607))
bb := utils.Float64ToStr(jxutils.IntCoordinate2Standard(30560797))
fmt.Println(aa)
fmt.Println(bb)
}