From bba3e273f69bd15389819213a8f511f580cf1567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 24 Mar 2021 10:17:11 +0800
Subject: [PATCH] aa

---
 business/jxcallback/orderman/order.go | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 1aecca92e..bffa12d16 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -345,14 +345,12 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao
 	} else {
 		globals.SugarLogger.Warnf("saveOrder create order:%v, error:%v", order, err)
 	}
-	if err == nil {
-		dao.Commit(db)
-	}
 	//修改商品库存
 	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
 }
@@ -384,7 +382,7 @@ func ModifyOrderSkusStock(db *dao.DaoDB, order *model.GoodsOrder, isAdd bool) (e
 				if len(storeSkus2) > 0 {
 					storeSku3 := storeSkus2[0]
 					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)
@@ -393,9 +391,9 @@ func ModifyOrderSkusStock(db *dao.DaoDB, order *model.GoodsOrder, isAdd bool) (e
 			}
 		}
 		storeSku.Stock = stock
-		dao.UpdateEntity(db, storeSku, "Stock")
+		db.Db.Update(storeSku, "Stock")
 		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
@@ -597,9 +595,6 @@ func updateSingleOrderEarningPrice(order *model.GoodsOrder, db *dao.DaoDB) {
 						if true { //v.StoreSubName != "" { // 之前这里为什么要加判断？
 							v.StoreSubID = actStoreSku.ActID
 						}
-						if v.EarningPrice != v.ShopPrice {
-							baseapi.SugarLogger.Warnf("不等于了。:%v", v.EarningPrice, order.VendorOrderID, utils.Format4Output(actStoreSku, false))
-						}
 					}
 				}
 			}