- 自配送门店的PickupGoods不应调用平台相应API,模拟一个事件

This commit is contained in:
gazebo
2019-03-22 20:55:59 +08:00
parent 753ce06d0b
commit 837395f431
9 changed files with 59 additions and 29 deletions

View File

@@ -186,6 +186,21 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *mtwmapi.CallbackMsg) *model.Or
return orderStatus
}
func (c *PurchaseHandler) postFakeFinishedPickupMsg(vendorOrderID string) {
msg := &mtwmapi.CallbackMsg{
Cmd: mtwmapi.MsgTypeOrderAccepted,
Data: make(url.Values),
}
timeStr := utils.Int64ToStr(time.Now().Unix())
msg.Data.Add(mtwmapi.KeyOrderID, vendorOrderID)
msg.Data.Add("status", mtwmapi.OrderStatusAccepted)
msg.Data.Add("timestamp", timeStr)
msg.Data.Add("utime", timeStr)
utils.CallFuncAsync(func() {
OnOrderCallbackMsg(msg)
})
}
func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
if globals.EnableStoreWrite && globals.EnableMtwmStoreWrite {
if isAcceptIt {
@@ -209,9 +224,11 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
return err
}
func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, userName string) (err error) {
if globals.EnableStoreWrite && globals.EnableMtwmStoreWrite {
func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDeilivery bool, userName string) (err error) {
if globals.EnableStoreWrite && globals.EnableMtwmStoreWrite && !isSelfDeilivery {
err = api.MtwmAPI.OrderConfirm(utils.Str2Int64(order.VendorOrderID))
} else {
c.postFakeFinishedPickupMsg(order.VendorOrderID)
}
return nil
}