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-07-30 14:17:16 +08:00
parent d170c35042
commit bafc9cc552
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,6 +194,10 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
} }
isDuplicated, order, err := c.addOrderStatus(orderStatus, db) isDuplicated, order, err := c.addOrderStatus(orderStatus, db)
if orderStatus.VendorOrderID == "3901182973700720079" {
globals.SugarLogger.Debugf("=======isDuplicated2 := %s", utils.Format4Output(isDuplicated, false))
globals.SugarLogger.Debugf("=======order := %s", utils.Format4Output(order, false))
}
if err == nil { if err == nil {
dao.Commit(db, txDB) dao.Commit(db, txDB)
if orderStatus.Status == model.OrderStatusWaybillTipChanged { if orderStatus.Status == model.OrderStatusWaybillTipChanged {
@@ -291,10 +295,6 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
} else { } else {
partner.CurOrderManager.OnOrderMsg(order2, utils.Int2Str(order2.Status), fmt.Sprintf("取消订单申请赔付:%s", "成功")) partner.CurOrderManager.OnOrderMsg(order2, utils.Int2Str(order2.Status), fmt.Sprintf("取消订单申请赔付:%s", "成功"))
} }
if order2.VendorOrderID == "3901182973700720079" {
globals.SugarLogger.Debugf("=======order2 := %s", utils.Format4Output(order2, false))
globals.SugarLogger.Debugf("=======orderStatus := %s", utils.Format4Output(orderStatus, false))
}
if order2.Status != model.OrderStatusCanceled { if order2.Status != model.OrderStatusCanceled {
order2.Status = model.OrderStatusCanceled order2.Status = model.OrderStatusCanceled
@@ -974,6 +974,11 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da
} }
isDuplicated, err = addOrderOrWaybillStatus(orderStatus, db) isDuplicated, err = addOrderOrWaybillStatus(orderStatus, db)
if orderStatus.VendorOrderID == "3901182973700720079" {
globals.SugarLogger.Debugf("=======order2 := %s", utils.Format4Output(orderStatus, false))
globals.SugarLogger.Debugf("=======isDuplicated := %s", utils.Format4Output(isDuplicated, false))
globals.SugarLogger.Debugf("=======err := %v", err)
}
if err == nil && !isDuplicated && (orderStatus.Status != model.OrderStatusUnknown && orderStatus.Status != model.OrderStatusMsg) { if err == nil && !isDuplicated && (orderStatus.Status != model.OrderStatusUnknown && orderStatus.Status != model.OrderStatusMsg) {
// todo 加这个代码的原因是,抖店运单取消会去将本地的订单状态设置为取消,跳过,不修改本地订单状态 // todo 加这个代码的原因是,抖店运单取消会去将本地的订单状态设置为取消,跳过,不修改本地订单状态
if orderStatus.RefVendorID == model.VendorIDDD && orderStatus.OrderType == model.OrderTypeWaybill && orderStatus.VendorStatus == utils.Int64ToStr(tiktok_api.ShipmentStatusCanceled) { if orderStatus.RefVendorID == model.VendorIDDD && orderStatus.OrderType == model.OrderTypeWaybill && orderStatus.VendorStatus == utils.Int64ToStr(tiktok_api.ShipmentStatusCanceled) {
@@ -1025,6 +1030,10 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da
} }
utils.CallFuncLogError(func() error { utils.CallFuncLogError(func() error {
if orderStatus.VendorOrderID == "3901182973700720079" {
globals.SugarLogger.Debugf("=======order := %s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("=======updateFields := %s", utils.Format4Output(updateFields, false))
}
_, err = db.Db.Update(order, updateFields...) _, err = db.Db.Update(order, updateFields...)
return err return err
}, "addOrderStatus update orderID:%s, status:%v", order.VendorOrderID, orderStatus) }, "addOrderStatus update orderID:%s, status:%v", order.VendorOrderID, orderStatus)