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:
邹宗楠
2024-03-24 18:39:39 +08:00
parent a325916bc1
commit 4dd488c0ec
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,18 +115,12 @@ func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, orderStatus *model
order.Status = model.OrderStatusAccepted order.Status = model.OrderStatusAccepted
} }
isDuplicated, err := addOrderOrWaybillStatus(orderStatus, db) isDuplicated, err := addOrderOrWaybillStatus(orderStatus, db)
if order.VendorOrderID == "4075590068743535177" {
globals.SugarLogger.Debugf("============isDuplicated : %s", utils.Format4Output(isDuplicated, false))
globals.SugarLogger.Debugf("============err : %v", err)
globals.SugarLogger.Debugf("============order : %s", utils.Format4Output(order, false))
}
if err == nil && !isDuplicated { if err == nil && !isDuplicated {
err = utils.CallFuncLogError(func() error { err = utils.CallFuncLogError(func() error {
_, err = db.Db.Raw("DELETE FROM order_sku WHERE vendor_order_id = ? AND vendor_id = ?", order.VendorOrderID, order.VendorID).Exec() _, err = db.Db.Raw("DELETE FROM order_sku WHERE vendor_order_id = ? AND vendor_id = ?", order.VendorOrderID, order.VendorID).Exec()
return err return err
}, "OnAdjustOrder delete order, orderID:%s", order.VendorOrderID) }, "OnAdjustOrder delete order, orderID:%s", order.VendorOrderID)
if err != nil { if err != nil {
globals.SugarLogger.Debugf("============err1 : %v", err)
return err return err
} }
adjustCount := int8(0) adjustCount := int8(0)
@@ -135,7 +129,6 @@ func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, orderStatus *model
VendorID: order.VendorID, VendorID: order.VendorID,
} }
if err = dao.GetEntity(db, previousOrder, model.FieldVendorOrderID, model.FieldVendorID); err != nil && !dao.IsNoRowsError(err) { if err = dao.GetEntity(db, previousOrder, model.FieldVendorOrderID, model.FieldVendorID); err != nil && !dao.IsNoRowsError(err) {
globals.SugarLogger.Debugf("============err2 : %v", err)
return err return err
} }
if err == nil { if err == nil {
@@ -159,8 +152,6 @@ func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, orderStatus *model
order.TotalShopMoney = order2.TotalShopMoney order.TotalShopMoney = order2.TotalShopMoney
} }
isDuplicated, err = c.SaveOrder(order, true, db) isDuplicated, err = c.SaveOrder(order, true, db)
globals.SugarLogger.Debugf("============err3 : %v", err)
globals.SugarLogger.Debugf("============isDuplicated : %v", utils.Format4Output(isDuplicated, false))
} }
if err == nil { if err == nil {
dao.Commit(db, txDB) dao.Commit(db, txDB)

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

@@ -541,11 +541,7 @@ func (c *PurchaseHandler) onOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi.
if status != nil { if status != nil {
if status.Status == model.OrderStatusAdjust { if status.Status == model.OrderStatusAdjust {
var order *model.GoodsOrder var order *model.GoodsOrder
order, err = c.GetOrder4PartRefund(GetOrderIDFromMsg(msg)) if order, err = c.GetOrder4PartRefund(GetOrderIDFromMsg(msg)); err == nil {
globals.SugarLogger.Debugf("==================msg %s", utils.Format4Output(msg, false))
globals.SugarLogger.Debugf("==================order %s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("==================msg %v", err)
if err == nil {
err = partner.CurOrderManager.OnOrderAdjust(order, status) err = partner.CurOrderManager.OnOrderAdjust(order, status)
} }
} else { } else {