From c6ae8e830ddfcb8b338b7e7ff9f5c41fde2263d9 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 23 Sep 2019 18:26:11 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BA=AC=E8=A5=BF=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=81=87=E8=AE=A2=E5=8D=95=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8D=E7=9B=B4=E6=8E=A5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=94=B9=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/order.go               |  2 +-
 business/partner/purchase/jx/order.go | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/business/model/order.go b/business/model/order.go
index 7d8589f57..641d2581c 100644
--- a/business/model/order.go
+++ b/business/model/order.go
@@ -62,7 +62,7 @@ type GoodsOrder struct {
 	OrderCreatedAt        time.Time `orm:"type(datetime);index" json:"orderCreatedAt"`       // 这里记录的是订单生效时间，即用户支付完成（货到付款即为下单时间）
 	OrderFinishedAt       time.Time `orm:"type(datetime)" json:"orderFinishedAt"`
 	StatusTime            time.Time `orm:"type(datetime)" json:"statusTime"` // last status time
-	PickDeadline          time.Time `orm:"type(datetime)" json:"pickDeadline"`
+	PickDeadline          time.Time `orm:"type(datetime);null" json:"pickDeadline"`
 	ModelTimeInfo         `json:"-"`
 	Flag                  int `json:"flag"` //非运单调整相关的其它状态
 
diff --git a/business/partner/purchase/jx/order.go b/business/partner/purchase/jx/order.go
index 3ab6eec34..ab21e05d0 100644
--- a/business/partner/purchase/jx/order.go
+++ b/business/partner/purchase/jx/order.go
@@ -80,12 +80,13 @@ func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err
 }
 
 func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
+	var status int
 	if isAcceptIt {
-		order.Status = model.OrderStatusAccepted
+		status = model.OrderStatusAccepted
 	} else {
-		order.Status = model.OrderStatusCanceled
+		status = model.OrderStatusCanceled
 	}
-	c.postFakeMsg(order.VendorOrderID, order.Status)
+	c.postFakeMsg(order.VendorOrderID, status)
 	jxAPI.NotifyOrderStatusChanged(order)
 	return err
 }
@@ -118,16 +119,14 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName
 }
 
 func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
-	order.Status = model.OrderStatusDelivering
-	c.postFakeMsg(order.VendorOrderID, order.Status)
+	c.postFakeMsg(order.VendorOrderID, model.OrderStatusDelivering)
 	jxAPI.NotifyOrderStatusChanged(order)
 	return err
 }
 
 // 京东送达接口都是一样的
 func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) {
-	order.Status = model.OrderStatusFinished
-	c.postFakeMsg(order.VendorOrderID, order.Status)
+	c.postFakeMsg(order.VendorOrderID, model.OrderStatusFinished)
 	jxAPI.NotifyOrderStatusChanged(order)
 	return err
 }
@@ -163,8 +162,7 @@ func (c *PurchaseHandler) AddWaybillTip(ctx *jxcontext.Context, order *model.Goo
 func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, vendorOrderID, selfTakeCode string) (err error) {
 	order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDJX)
 	if err == nil {
-		order.Status = model.OrderStatusFinished
-		c.postFakeMsg(order.VendorOrderID, order.Status)
+		c.postFakeMsg(order.VendorOrderID, model.OrderStatusFinished)
 		jxAPI.NotifyOrderStatusChanged(order)
 	}
 	return err