liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 京西商城发送假订单消息时，不直接修改改订单状态

Browse Source
This commit is contained in:
gazebo
2019-09-23 18:26:11 +08:00
parent f0f7d241d5
commit c6ae8e830d
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/model/order.go
View File

@@ -62,7 +62,7 @@ type GoodsOrder struct {
OrderCreatedAt time.Time `orm:"type(datetime);index" json:"orderCreatedAt"` // 这里记录的是订单生效时间，即用户支付完成（货到付款即为下单时间） OrderCreatedAt time.Time `orm:"type(datetime);index" json:"orderCreatedAt"` // 这里记录的是订单生效时间，即用户支付完成（货到付款即为下单时间）
OrderFinishedAt time.Time `orm:"type(datetime)" json:"orderFinishedAt"` OrderFinishedAt time.Time `orm:"type(datetime)" json:"orderFinishedAt"`
StatusTime time.Time `orm:"type(datetime)" json:"statusTime"` // last status time 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:"-"` ModelTimeInfo `json:"-"`
Flag int `json:"flag"` //非运单调整相关的其它状态 Flag int `json:"flag"` //非运单调整相关的其它状态

16
business/partner/purchase/jx/order.go
View File

@@ -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) { func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
var status int
if isAcceptIt { if isAcceptIt {
order.Status = model.OrderStatusAccepted status = model.OrderStatusAccepted
} else { } else {
order.Status = model.OrderStatusCanceled status = model.OrderStatusCanceled
} }
c.postFakeMsg(order.VendorOrderID, order.Status) c.postFakeMsg(order.VendorOrderID, status)
jxAPI.NotifyOrderStatusChanged(order) jxAPI.NotifyOrderStatusChanged(order)
return err 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) { func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
order.Status = model.OrderStatusDelivering c.postFakeMsg(order.VendorOrderID, model.OrderStatusDelivering)
c.postFakeMsg(order.VendorOrderID, order.Status)
jxAPI.NotifyOrderStatusChanged(order) jxAPI.NotifyOrderStatusChanged(order)
return err return err
} }
// 京东送达接口都是一样的 // 京东送达接口都是一样的
func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) {
order.Status = model.OrderStatusFinished c.postFakeMsg(order.VendorOrderID, model.OrderStatusFinished)
c.postFakeMsg(order.VendorOrderID, order.Status)
jxAPI.NotifyOrderStatusChanged(order) jxAPI.NotifyOrderStatusChanged(order)
return err 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) { func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, vendorOrderID, selfTakeCode string) (err error) {
order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDJX) order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDJX)
if err == nil { if err == nil {
order.Status = model.OrderStatusFinished c.postFakeMsg(order.VendorOrderID, model.OrderStatusFinished)
c.postFakeMsg(order.VendorOrderID, order.Status)
jxAPI.NotifyOrderStatusChanged(order) jxAPI.NotifyOrderStatusChanged(order)
} }
return err return err