This commit is contained in:
邹宗楠
2024-10-14 12:41:49 +08:00
parent 1c136089da
commit e17042afd0
11 changed files with 166 additions and 53 deletions

View File

@@ -354,6 +354,10 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
if msg.Cmd == mtwmapi.MsgTypeNewOrder {
order, orderMap, err2 := c.getOrder(msg.AppID, GetOrderIDFromMsg(msg), GetVendorStoreIDFromMsg(msg))
if err = err2; err == nil {
// 存在新订单用户未支付推送,导致订单取消,但是订单又会被送出
if order.OrderSeq == 0 && msg.Cmd == mtwmapi.MsgTypeOrderFinancial {
return mtwmapi.Err2CallbackResponse(err, "")
}
err = partner.CurOrderManager.OnOrderNew(order, c.callbackMsg2Status(msg))
if err == nil {
utils.CallFuncAsync(func() {
@@ -369,7 +373,7 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
order, orderObj, err2 := c.getOrder(msg.AppID, GetOrderIDFromMsg(msg), GetVendorStoreIDFromMsg(msg))
localOrder, _ := partner.CurOrderManager.LoadOrder(GetOrderIDFromMsg(msg), model.VendorIDMTWM)
if localOrder == nil {
return nil
return mtwmapi.Err2CallbackResponse(err, "")
// 会存在用户没支付订单,但是订单已经创建了,这个时候有可能会取消订单,所以这个地方直接退出不管了
// 等到美团推送新订单的时候再创建订单
/* localOrder = order