test
This commit is contained in:
@@ -1905,20 +1905,15 @@ func UpdateOrderInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int,
|
|||||||
db = dao.GetDB()
|
db = dao.GetDB()
|
||||||
)
|
)
|
||||||
order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
|
order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
|
||||||
fmt.Println("order", utils.Format4Output(order, false))
|
if payload["consigneeLng"] != nil || payload["consigneeLat"] != nil {
|
||||||
|
payload["consigneeLng"] = jxutils.StandardCoordinate2Int(utils.Interface2Float64WithDefault(payload["consigneeLng"], 0.0))
|
||||||
|
payload["consigneeLat"] = jxutils.StandardCoordinate2Int(utils.Interface2Float64WithDefault(payload["consigneeLat"], 0.0))
|
||||||
|
}
|
||||||
|
if payload["expectedDeliveredTime"] != nil {
|
||||||
|
payload["expectedDeliveredTime"] = utils.Str2Time(payload["expectedDeliveredTime"].(string))
|
||||||
|
}
|
||||||
valid := dao.StrictMakeMapByStructObject(payload, order, ctx.GetUserName())
|
valid := dao.StrictMakeMapByStructObject(payload, order, ctx.GetUserName())
|
||||||
fmt.Println("valid", valid)
|
|
||||||
if len(valid) > 0 {
|
if len(valid) > 0 {
|
||||||
if payload["consigneeLng"] != nil || payload["consigneeLat"] != nil {
|
|
||||||
intLng := jxutils.StandardCoordinate2Int(utils.Interface2Float64WithDefault(payload["consigneeLng"], 0.0))
|
|
||||||
intLat := jxutils.StandardCoordinate2Int(utils.Interface2Float64WithDefault(payload["consigneeLat"], 0.0))
|
|
||||||
if intLng != 0 && intLng != order.ConsigneeLng {
|
|
||||||
valid["consigneeLng"] = intLng
|
|
||||||
}
|
|
||||||
if intLat != 0 && intLat != order.ConsigneeLat {
|
|
||||||
valid["consigneeLat"] = intLat
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dao.Begin(db)
|
dao.Begin(db)
|
||||||
defer func() {
|
defer func() {
|
||||||
if r := recover(); r != nil {
|
if r := recover(); r != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user