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-10-25 09:14:25 +08:00
parent 4ae21905d7
commit 211513b137
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ import (
"crypto/md5"
"errors"
"fmt"
"git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
"math"
"strings"
"time"
@@ -172,20 +173,18 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
}()
// 有些平台（比如美团外卖），在新订单事件没有成功返回，但在重发订单消息前，订单状态转换，则不会再重发新订单事件，特殊处理一下
if orderStatus != nil {
if orderStatus.Status == model.OrderStatusAccepted {
if _, err2 := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID); err2 == ErrCanNotFindOrder {
if handler := partner.GetPurchaseOrderHandlerFromVendorID(orderStatus.VendorID); handler != nil {
if order, err2 := handler.GetOrder(vendorOrgCode, orderStatus.VendorOrderID, ""); err2 == nil && order != nil {
c.OnOrderNew(order, orderStatus)
}
if orderStatus != nil && orderStatus.Status == model.OrderStatusAccepted {
loadOrder, err2 := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID)
if err2 == ErrCanNotFindOrder {
if handler := partner.GetPurchaseOrderHandlerFromVendorID(orderStatus.VendorID); handler != nil {
if order, err2 := handler.GetOrder(vendorOrgCode, orderStatus.VendorOrderID, ""); err2 == nil && order != nil {
c.OnOrderNew(order, orderStatus)
}
}
//else {
// loadOrder.Status = model.OrderStatusAccepted
// loadOrder.VendorStatus = tao_vegetable.OrderStatusNew
// c.UpdateOrderFields(loadOrder, []string{"Status", "VendorStatus"})
//}
} else if loadOrder.Status < model.OrderStatusAccepted {
loadOrder.Status = model.OrderStatusAccepted
loadOrder.VendorStatus = tao_vegetable.OrderStatusNew
c.UpdateOrderFields(loadOrder, []string{"Status", "VendorStatus"})
}
}