1
This commit is contained in:
@@ -373,12 +373,6 @@ func setFakeOrderFlag(db *dao.DaoDB, order *model.GoodsOrder) {
|
||||
}
|
||||
|
||||
func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao.DaoDB) (isDuplicated bool, err error) {
|
||||
// 忽略美团超市的订单
|
||||
if order.VendorID == model.VendorIDMTWM {
|
||||
if order.VendorStoreID == "2391979" || order.VendorStoreID == "7379027" {
|
||||
return
|
||||
}
|
||||
}
|
||||
// 忽略查找JX信息错误
|
||||
c.updateOrderOtherInfo(order, db)
|
||||
order.ID = 0
|
||||
@@ -398,22 +392,20 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao
|
||||
}
|
||||
}()
|
||||
// todo hardcode 兼容京东消息错序问题
|
||||
if true { //order.VendorID == model.VendorIDJD {
|
||||
orderStatus := &model.OrderStatus{}
|
||||
if dao.GetRow(db, orderStatus, `
|
||||
orderStatus := &model.OrderStatus{}
|
||||
if dao.GetRow(db, orderStatus, `
|
||||
SELECT *
|
||||
FROM order_status
|
||||
WHERE order_type = ? AND vendor_order_id = ? AND vendor_id = ? AND status > 0
|
||||
ORDER BY status_time DESC
|
||||
LIMIT 1
|
||||
`, model.OrderTypeOrder, order.VendorOrderID, order.VendorID) == nil {
|
||||
if orderStatus.Status > order.Status {
|
||||
order.Status = orderStatus.Status
|
||||
order.VendorStatus = orderStatus.VendorStatus
|
||||
order.StatusTime = orderStatus.StatusTime
|
||||
if orderStatus.Status > order.Status {
|
||||
order.Status = orderStatus.Status
|
||||
order.VendorStatus = orderStatus.VendorStatus
|
||||
order.StatusTime = orderStatus.StatusTime
|
||||
|
||||
// jxutils.RefreshOrderSkuRelated(order)
|
||||
}
|
||||
// jxutils.RefreshOrderSkuRelated(order)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user