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:16:29 +08:00
parent 3bb2f5e41e
commit 210cf8aee7
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,12 +115,18 @@ 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)
@@ -129,6 +135,7 @@ 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 {
@@ -152,6 +159,8 @@ 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)

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

@@ -127,13 +127,8 @@ func (p *PurchaseHandler) GetOrder4PartRefund(vendorOrderID string) (order *mode
}, taskIDs) }, taskIDs)
task.Run() task.Run()
task.GetResult(0) task.GetResult(0)
globals.SugarLogger.Debugf("=======result1 : %s", utils.Format4Output(result1, false))
globals.SugarLogger.Debugf("=======err1 : %v", err1)
globals.SugarLogger.Debugf("=======result1 : %s", utils.Format4Output(result1, false))
globals.SugarLogger.Debugf("=======err2 : %v", err2)
if err1 == nil { if err1 == nil {
order = p.Map2Order(result1) order = p.Map2Order(result1)
globals.SugarLogger.Debugf("=======order : %s", utils.Format4Output(order, false))
if err2 == nil { if err2 == nil {
order.Skus = p.partRefund2OrderDetailSkuList(utils.Interface2String(result2["order_id"]), result2["reverse_order_list"]) order.Skus = p.partRefund2OrderDetailSkuList(utils.Interface2String(result2["order_id"]), result2["reverse_order_list"])
giftSkus, discountMoney := getZengSkus(vendorOrderID, result1) giftSkus, discountMoney := getZengSkus(vendorOrderID, result1)