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

1

Browse Source
This commit is contained in:
邹宗楠
2023-12-08 11:35:49 +08:00
parent 0ca6f8a4aa
commit e6cb5b1bdd
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/orderman/order.go
View File

@@ -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) isDuplicated, order, err := c.addOrderStatus(orderStatus, db)
if err == nil { if err == nil {
dao.Commit(db, txDB) dao.Commit(db, txDB)

12
business/partner/purchase/mtwm/order.go
View File

@@ -345,9 +345,6 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
return response return response
} else { } else {
status := c.callbackMsg2Status(msg) status := c.callbackMsg2Status(msg)
if status.RefVendorOrderID == "1100842032100912947" {
globals.SugarLogger.Debugf("======================: %s", utils.Format4Output(status, false))
}
if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 1 { // 重复消息推送校验,允许推送两次 if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 1 { // 重复消息推送校验,允许推送两次
return nil 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) err = partner.CurOrderManager.OnOrderStatusChanged(msg.AppID, status)
if err == nil && msg.Cmd == mtwmapi.MsgTypeOrderFinished { if err == nil && msg.Cmd == mtwmapi.MsgTypeOrderFinished {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
@@ -515,6 +510,11 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
"订单已经确认过了", "订单已经确认过了",
}) { }) {
err = nil 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 { } else {
globals.SugarLogger.Warnf("mtwm AcceptOrRefuseOrder orderID:%s failed with err:%v", order.VendorOrderID, err) globals.SugarLogger.Warnf("mtwm AcceptOrRefuseOrder orderID:%s failed with err:%v", order.VendorOrderID, err)
} }