diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 383e76223..27d1f8d2a 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -343,9 +343,9 @@ func ModifyOrderSkusStock(db *dao.DaoDB, order *model.GoodsOrder, isAdd bool) (e continue } if isAdd { - stock = storeSku.Stock + 1 + stock = storeSku.Stock + sku.Count } else { - stock = storeSku.Stock - 1 + stock = storeSku.Stock - sku.Count } storeSku.Stock = stock dao.UpdateEntity(db, storeSku, "Stock") diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index b51631a48..3494645cb 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -1253,25 +1253,25 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs // updateFieldMap["UnitPrice"] = 1 // updateFieldMap["Price"] = 1 } - if inSkuBind != nil { - if inSkuBind.Stock != nil { - updateFieldMap["Stock"] = 1 - skuBind.Stock = *inSkuBind.Stock - setStoreSkuBindStatus(skuBind, model.SyncFlagStockMask) - } - } if tmpStatus := getSkuSaleStatus(inSkuBind, skuBindInfo); tmpStatus != model.StoreSkuBindStatusNA { if tmpStatus != skuBind.Status { updateFieldMap[model.FieldStatus] = 1 } skuBind.Status = tmpStatus setStoreSkuBindStatus(skuBind, model.SyncFlagSaleMask) - // setStoreSkuBindStatus(skuBind, model.SyncFlagStockMask) - // if tmpStatus == model.StoreSkuBindStatusNormal { - // skuBind.Stock = model.MaxStoreSkuStockQty - // } else { - // skuBind.Stock = 0 - // } + setStoreSkuBindStatus(skuBind, model.SyncFlagStockMask) + if tmpStatus == model.StoreSkuBindStatusNormal { + skuBind.Stock = model.MaxStoreSkuStockQty + } else { + skuBind.Stock = 0 + } + } + if inSkuBind != nil { + if inSkuBind.Stock != nil { + updateFieldMap["Stock"] = 1 + skuBind.Stock = *inSkuBind.Stock + setStoreSkuBindStatus(skuBind, model.SyncFlagStockMask) + } } if skuBindInfo.UnitPrice != 0 && isCanChangePrice { // 这里是否需要加此条件限制 price := jxutils.CaculateSkuPrice(unitPrice, v.SpecQuality, v.SpecUnit, v.SkuNameUnit)