From 6e07a0a6370f2c7809e65a10948bbfb753b29768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 27 Jun 2020 13:48:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=94=AE=E5=90=8E=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go     |  4 ++--
 business/partner/partner.go               |  2 +-
 business/partner/purchase/jd/order.go     | 20 +++++++++-----------
 business/partner/purchase/jx/order_afs.go |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 0f2aebec6..5f981e63b 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -208,9 +208,9 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
 	return err
 }
 
-func (c *OrderManager) ChangeOrderInfo(order *model.GoodsOrder, valid map[string]interface{}) (err error) {
+func (c *OrderManager) ChangeOrderInfo(order *model.GoodsOrder) (err error) {
 	db := dao.GetDB()
-	dao.UpdateEntityLogically(db, order, valid, "jxadmin", nil)
+	_, err = dao.UpdateEntity(db, order, "ConsigneeAddress", "ConsigneeName", "ConsigneeMobile", "ConsigneeLat", "ConsigneeLng", "BuyerComment")
 	return err
 }
 
diff --git a/business/partner/partner.go b/business/partner/partner.go
index a24968fb8..f1817232b 100644
--- a/business/partner/partner.go
+++ b/business/partner/partner.go
@@ -114,7 +114,7 @@ type IOrderManager interface {
 
 	GetOrderWaybillInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int, isNotEnded, isGetPos bool) (bills []*model.WaybillExt, err error)
 
-	ChangeOrderInfo(order *model.GoodsOrder, valid map[string]interface{}) (err error)
+	ChangeOrderInfo(order *model.GoodsOrder (err error)
 	// afs order
 	OnAfsOrderAdjust(afsOrder *model.AfsOrder, orderStatus *model.OrderStatus) (err error)
 	OnAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *model.OrderStatus) (err error)
diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index 273479a04..edbb5c13d 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -127,8 +127,8 @@ func (c *PurchaseHandler) onOrderInfoChangeMsg(vendorOrgCode string, msg *jdapi.
 	order, _, err := c.getOrder(a, msg.BillID)
 	if err == nil {
 		globals.SugarLogger.Debugf("onOrderInfoChangeMsg orderID:%s", msg.BillID)
-		valid := orderInfoChangeSet(order, msg)
-		partner.CurOrderManager.ChangeOrderInfo(order, valid)
+		orderInfoChangeSet(order, msg)
+		partner.CurOrderManager.ChangeOrderInfo(order)
 	}
 	return retVal
 }
@@ -574,25 +574,23 @@ func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, order *model.G
 	return err
 }
 
-func orderInfoChangeSet(order *model.GoodsOrder, msg *jdapi.CallbackOrderInfoChangeMsg) (valid map[string]interface{}) {
-	valid = make(map[string]interface{})
+func orderInfoChangeSet(order *model.GoodsOrder, msg *jdapi.CallbackOrderInfoChangeMsg) {
 	if msg.BuyerFullAddress != "" {
-		valid["consigneeAddress"] = msg.BuyerFullAddress
+		order.ConsigneeAddress = msg.BuyerFullAddress
 	}
 	if msg.BuyerFullName != "" {
-		valid["consigneeName"] = msg.BuyerFullName
+		order.ConsigneeName = msg.BuyerFullName
 	}
 	if msg.BuyerMobile != "" {
-		valid["consigneeMobile"] = msg.BuyerMobile
+		order.ConsigneeMobile = msg.BuyerMobile
 	}
 	if msg.BuyerLat != 0 {
-		valid["consigneeLat"] = jxutils.StandardCoordinate2Int(msg.BuyerLat)
+		order.ConsigneeLat = jxutils.StandardCoordinate2Int(msg.BuyerLat)
 	}
 	if msg.BuyerLng != 0 {
-		valid["consigneeLng"] = jxutils.StandardCoordinate2Int(msg.BuyerLng)
+		order.ConsigneeLng = jxutils.StandardCoordinate2Int(msg.BuyerLng)
 	}
 	if msg.OrderBuyerRemark != "" {
-		valid["buyerComment"] = msg.OrderBuyerRemark
+		order.BuyerComment = msg.OrderBuyerRemark
 	}
-	return valid
 }
diff --git a/business/partner/purchase/jx/order_afs.go b/business/partner/purchase/jx/order_afs.go
index bffcfb102..2596c13d3 100644
--- a/business/partner/purchase/jx/order_afs.go
+++ b/business/partner/purchase/jx/order_afs.go
@@ -58,7 +58,7 @@ func (c *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, ord
 
 // 发起全款退款
 func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
-	c.PartRefundOrder(ctx, order, order.Skus, reason)
+	err = c.PartRefundOrder(ctx, order, order.Skus, reason)
 	return err
 }