From e6cb5b1bddae340005d587e9eaf136f45af34523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 8 Dec 2023 11:35:49 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/order.go | 3 --- business/partner/purchase/mtwm/order.go | 12 ++++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index c5d66269f..33847a088 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -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) diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index b601ce08c..2d42852b3 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -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) }