From 7363cac26f218723c5b1a76dcbc04bbc26e3bf5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 6 Nov 2020 11:04:55 +0800
Subject: [PATCH] test

---
 business/jxcallback/orderman/order.go | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 6beeb7e36..8edf55f0b 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1905,20 +1905,15 @@ func UpdateOrderInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int,
 		db = dao.GetDB()
 	)
 	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())
-	fmt.Println("valid", valid)
 	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)
 		defer func() {
 			if r := recover(); r != nil {