1
This commit is contained in:
@@ -189,9 +189,6 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
|
||||
}
|
||||
}
|
||||
|
||||
if orderStatus.RefVendorOrderID == "1100842032100912947" {
|
||||
globals.SugarLogger.Debugf("======================: %s", utils.Format4Output(orderStatus, false))
|
||||
}
|
||||
isDuplicated, order, err := c.addOrderStatus(orderStatus, db)
|
||||
if err == nil {
|
||||
dao.Commit(db, txDB)
|
||||
|
||||
@@ -345,9 +345,6 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
|
||||
return response
|
||||
} else {
|
||||
status := c.callbackMsg2Status(msg)
|
||||
if status.RefVendorOrderID == "1100842032100912947" {
|
||||
globals.SugarLogger.Debugf("======================: %s", utils.Format4Output(status, false))
|
||||
}
|
||||
if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 1 { // 重复消息推送校验,允许推送两次
|
||||
return nil
|
||||
}
|
||||
@@ -394,9 +391,7 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
|
||||
}
|
||||
})
|
||||
}
|
||||
if status.RefVendorOrderID == "1100842032100912947" {
|
||||
globals.SugarLogger.Debugf("======================: %s", utils.Format4Output(status, false))
|
||||
}
|
||||
|
||||
err = partner.CurOrderManager.OnOrderStatusChanged(msg.AppID, status)
|
||||
if err == nil && msg.Cmd == mtwmapi.MsgTypeOrderFinished {
|
||||
utils.CallFuncAsync(func() {
|
||||
@@ -515,6 +510,11 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
|
||||
"订单已经确认过了",
|
||||
}) {
|
||||
err = nil
|
||||
goodsOrder, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID)
|
||||
if goodsOrder.Status < model.OrderStatusAccepted {
|
||||
order.Status = model.OrderStatusAccepted
|
||||
dao.UpdateEntity(dao.GetDB(), order, "Status")
|
||||
}
|
||||
} else {
|
||||
globals.SugarLogger.Warnf("mtwm AcceptOrRefuseOrder orderID:%s failed with err:%v", order.VendorOrderID, err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user