liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-24 10:17:11 +08:00
parent 08ddc2308d
commit bba3e273f6
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -345,14 +345,12 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao
} else { } else {
globals.SugarLogger.Warnf("saveOrder create order:%v, error:%v", order, err) globals.SugarLogger.Warnf("saveOrder create order:%v, error:%v", order, err)
} }
if err == nil {
dao.Commit(db)
}
//修改商品库存 //修改商品库存
if err == nil { if err == nil {
utils.CallFuncAsync(func() { err = ModifyOrderSkusStock(db, order, false)
err = ModifyOrderSkusStock(db, order, false) }
}) if err == nil {
dao.Commit(db)
} }
return isDuplicated, err return isDuplicated, err
} }
@@ -384,7 +382,7 @@ func ModifyOrderSkusStock(db *dao.DaoDB, order *model.GoodsOrder, isAdd bool) (e
if len(storeSkus2) > 0 { if len(storeSkus2) > 0 {
storeSku3 := storeSkus2[0] storeSku3 := storeSkus2[0]
storeSku3.Stock = storeSku3.Stock + sku.Count storeSku3.Stock = storeSku3.Stock + sku.Count
dao.UpdateEntity(db, storeSku3, "Stock") db.Db.Update(storeSku3, "Stock")
} }
} }
realStock := checkPriceDefendOrderByStock(db, jxutils.GetSaleStoreIDFromOrder(order), sku.SkuID, stock, storeSku.JxPrice) realStock := checkPriceDefendOrderByStock(db, jxutils.GetSaleStoreIDFromOrder(order), sku.SkuID, stock, storeSku.JxPrice)
@@ -393,9 +391,9 @@ func ModifyOrderSkusStock(db *dao.DaoDB, order *model.GoodsOrder, isAdd bool) (e
} }
} }
storeSku.Stock = stock storeSku.Stock = stock
dao.UpdateEntity(db, storeSku, "Stock") db.Db.Update(storeSku, "Stock")
if order.VendorID != model.VendorIDJX { if order.VendorID != model.VendorIDJX {
dao.SetStoreSkuSyncStatus(db, order.VendorID, []int{jxutils.GetSaleStoreIDFromOrder(order)}, []int{sku.SkuID}, model.SyncFlagStockMask) // dao.SetStoreSkuSyncStatus(db, order.VendorID, []int{jxutils.GetSaleStoreIDFromOrder(order)}, []int{sku.SkuID}, model.SyncFlagStockMask)
} }
} }
return err return err
@@ -597,9 +595,6 @@ func updateSingleOrderEarningPrice(order *model.GoodsOrder, db *dao.DaoDB) {
if true { //v.StoreSubName != "" { // 之前这里为什么要加判断？ if true { //v.StoreSubName != "" { // 之前这里为什么要加判断？
v.StoreSubID = actStoreSku.ActID v.StoreSubID = actStoreSku.ActID
} }
if v.EarningPrice != v.ShopPrice {
baseapi.SugarLogger.Warnf("不等于了。:%v", v.EarningPrice, order.VendorOrderID, utils.Format4Output(actStoreSku, false))
}
} }
} }
} }