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