- fk
This commit is contained in:
@@ -38,6 +38,7 @@ func (c *OrderManager) OnAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode
|
|||||||
|
|
||||||
func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *model.OrderStatus, isAdjust bool) (err error) {
|
func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *model.OrderStatus, isAdjust bool) (err error) {
|
||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
|
globals.SugarLogger.Debugf("onAfsOrderNew1 afsOrder:%s", utils.Format4Output(afsOrder, true))
|
||||||
c.setAfsOrderID(db, orderStatus)
|
c.setAfsOrderID(db, orderStatus)
|
||||||
if afsOrder.AfsOrderID == "" {
|
if afsOrder.AfsOrderID == "" {
|
||||||
afsOrder.AfsOrderID = orderStatus.VendorOrderID
|
afsOrder.AfsOrderID = orderStatus.VendorOrderID
|
||||||
@@ -48,6 +49,7 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode
|
|||||||
if afsOrder.Status == model.OrderStatusUnknown {
|
if afsOrder.Status == model.OrderStatusUnknown {
|
||||||
afsOrder.Status = orderStatus.Status
|
afsOrder.Status = orderStatus.Status
|
||||||
}
|
}
|
||||||
|
globals.SugarLogger.Debugf("onAfsOrderNew2 afsOrder:%s", utils.Format4Output(afsOrder, true))
|
||||||
dao.Begin(db)
|
dao.Begin(db)
|
||||||
defer func() {
|
defer func() {
|
||||||
if r := recover(); r != nil || err != nil {
|
if r := recover(); r != nil || err != nil {
|
||||||
@@ -308,7 +310,7 @@ func (c *OrderManager) UpdateAfsOrderFields(afsOrder *model.AfsOrder, fieldList
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *OrderManager) setAfsOrderID(db *dao.DaoDB, orderStatus *model.OrderStatus) {
|
func (c *OrderManager) setAfsOrderID(db *dao.DaoDB, orderStatus *model.OrderStatus) {
|
||||||
globals.SugarLogger.Warnf("setAfsOrderID orderStatus:%v", utils.Format4Output(orderStatus, true))
|
globals.SugarLogger.Debugf("setAfsOrderID1 orderStatus:%v", utils.Format4Output(orderStatus, true))
|
||||||
if orderStatus.VendorOrderID == "" {
|
if orderStatus.VendorOrderID == "" {
|
||||||
index := 1
|
index := 1
|
||||||
if afsOrderList, err2 := dao.GetAfsOrders(db, orderStatus.RefVendorID, orderStatus.RefVendorOrderID, ""); err2 == nil {
|
if afsOrderList, err2 := dao.GetAfsOrders(db, orderStatus.RefVendorID, orderStatus.RefVendorOrderID, ""); err2 == nil {
|
||||||
@@ -326,6 +328,7 @@ func (c *OrderManager) setAfsOrderID(db *dao.DaoDB, orderStatus *model.OrderStat
|
|||||||
}
|
}
|
||||||
orderStatus.VendorOrderID = composeAfsOrderID(orderStatus.RefVendorOrderID, index)
|
orderStatus.VendorOrderID = composeAfsOrderID(orderStatus.RefVendorOrderID, index)
|
||||||
}
|
}
|
||||||
|
globals.SugarLogger.Debugf("setAfsOrderID2 orderStatus:%v", utils.Format4Output(orderStatus, true))
|
||||||
}
|
}
|
||||||
|
|
||||||
func composeAfsOrderID(vendorOrderID string, index int) (afsOrderID string) {
|
func composeAfsOrderID(vendorOrderID string, index int) (afsOrderID string) {
|
||||||
|
|||||||
Reference in New Issue
Block a user