1
This commit is contained in:
@@ -201,9 +201,8 @@ func (c *OrderManager) addAfsOrderStatus(db *dao.DaoDB, orderStatus *model.Order
|
||||
db = dao.GetDB()
|
||||
}
|
||||
isDuplicated, err = addOrderOrWaybillStatus(orderStatus, db)
|
||||
globals.SugarLogger.Debugf("=========isDuplicated :%s", utils.Format4Output(isDuplicated, false))
|
||||
globals.SugarLogger.Debugf("=========err :%s", utils.Format4Output(err, false))
|
||||
if err == nil && !isDuplicated && (orderStatus.Status != model.OrderStatusUnknown && orderStatus.Status != model.OrderStatusMsg) {
|
||||
//if err == nil && !isDuplicated && (orderStatus.Status != model.OrderStatusUnknown && orderStatus.Status != model.OrderStatusMsg) {
|
||||
if err == nil && (orderStatus.Status != model.OrderStatusUnknown && orderStatus.Status != model.OrderStatusMsg) {
|
||||
order = &model.AfsOrder{
|
||||
AfsOrderID: orderStatus.VendorOrderID,
|
||||
VendorID: orderStatus.VendorID,
|
||||
@@ -236,8 +235,6 @@ func (c *OrderManager) addAfsOrderStatus(db *dao.DaoDB, orderStatus *model.Order
|
||||
updateFields = append(updateFields, "AfsTotalShopMoney")
|
||||
}
|
||||
}
|
||||
globals.SugarLogger.Debugf("=========order :%s", utils.Format4Output(order, false))
|
||||
globals.SugarLogger.Debugf("=========updateFields :%s", utils.Format4Output(updateFields, false))
|
||||
|
||||
utils.CallFuncLogError(func() error {
|
||||
_, err = dao.UpdateEntity(db, order, updateFields...)
|
||||
|
||||
@@ -83,8 +83,6 @@ func addOrderOrWaybillStatus(status *model.OrderStatus, db *dao.DaoDB) (isDuplic
|
||||
status.ID = 0
|
||||
status.Remark = utils.LimitUTF8StringLen(status.Remark, 255)
|
||||
created, _, err := db.Db.ReadOrCreate(status, "VendorOrderID", "VendorID", "OrderType", "Status", "VendorStatus", "StatusTime")
|
||||
globals.SugarLogger.Debugf("=================created:%v", created)
|
||||
globals.SugarLogger.Debugf("=================err:%v", err)
|
||||
if err == nil {
|
||||
if !created {
|
||||
isDuplicated = true
|
||||
@@ -101,7 +99,6 @@ func addOrderOrWaybillStatus(status *model.OrderStatus, db *dao.DaoDB) (isDuplic
|
||||
} else {
|
||||
dao.Commit(db, txDB)
|
||||
}
|
||||
globals.SugarLogger.Debugf("=================isDuplicated:%v", isDuplicated)
|
||||
return isDuplicated, err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user