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:
邹宗楠
2025-08-07 10:39:12 +08:00
parent 27046e45a2
commit 46ce34d726
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) { 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信息错误 // 忽略查找JX信息错误
c.updateOrderOtherInfo(order, db) c.updateOrderOtherInfo(order, db)
order.ID = 0 order.ID = 0
@@ -398,22 +392,20 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao
} }
}() }()
// todo hardcode 兼容京东消息错序问题 // todo hardcode 兼容京东消息错序问题
if true { //order.VendorID == model.VendorIDJD { orderStatus := &model.OrderStatus{}
orderStatus := &model.OrderStatus{} if dao.GetRow(db, orderStatus, `
if dao.GetRow(db, orderStatus, `
SELECT * SELECT *
FROM order_status FROM order_status
WHERE order_type = ? AND vendor_order_id = ? AND vendor_id = ? AND status > 0 WHERE order_type = ? AND vendor_order_id = ? AND vendor_id = ? AND status > 0
ORDER BY status_time DESC ORDER BY status_time DESC
LIMIT 1 LIMIT 1
`, model.OrderTypeOrder, order.VendorOrderID, order.VendorID) == nil { `, model.OrderTypeOrder, order.VendorOrderID, order.VendorID) == nil {
if orderStatus.Status > order.Status { if orderStatus.Status > order.Status {
order.Status = orderStatus.Status order.Status = orderStatus.Status
order.VendorStatus = orderStatus.VendorStatus order.VendorStatus = orderStatus.VendorStatus
order.StatusTime = orderStatus.StatusTime order.StatusTime = orderStatus.StatusTime
// jxutils.RefreshOrderSkuRelated(order) // jxutils.RefreshOrderSkuRelated(order)
}
} }
} }

9
business/partner/purchase/ebai/order.go
View File

@@ -357,9 +357,12 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
order.DiscountMoney = discountMoney order.DiscountMoney = discountMoney
order.Skus = append(order.Skus, giftSkus...) order.Skus = append(order.Skus, giftSkus...)
// 包装袋金额设置 // 包装袋金额+服务费
store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode) store, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorStoreID, model.VendorIDEBAI, order.VendorOrgCode)
order.PackagePrice = store.PackageSetting if store != nil {
order.StoreName = store.Name // 真实门店名称
order.PackagePrice = store.PackageSetting
}
jxutils.RefreshOrderSkuRelated(order) jxutils.RefreshOrderSkuRelated(order)
return order return order
} }

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

@@ -319,9 +319,13 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
} }
} }
// 包装袋金额设置 // 包装袋金额
store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode) store, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorStoreID, model.VendorIDTaoVegetable, order.VendorOrgCode)
order.PackagePrice = store.PackageSetting if store != nil {
order.StoreName = store.Name // 真实门店名称
order.PackagePrice = store.PackageSetting
}
jxutils.RefreshOrderSkuRelated(order) jxutils.RefreshOrderSkuRelated(order)
return order return order
} }