diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 3b135aae1..7e0cbe53d 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -54,8 +54,6 @@ const ( CopyStoreSkuModeFresh = "fresh" // 全新复制 CopyStoreSkuModeUpdate = "update" // 增量复制 CopyStoreSkuModeUpdatePrice = "updatePrice" // 增量复制价格 - - JxDefaultStock = 99999 ) //通用写入Excel @@ -1165,7 +1163,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs skuBind.Status = tmpStatus //关注设置默认库存 if tmpStatus == model.StoreSkuBindStatusNormal { - skuBind.Stock = JxDefaultStock + skuBind.Stock = model.MaxStoreSkuStockQty } else { skuBind.Stock = 0 } @@ -1243,25 +1241,26 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs // updateFieldMap["UnitPrice"] = 1 // updateFieldMap["Price"] = 1 } + 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 inSkuBind.Stock == nil { if tmpStatus == model.StoreSkuBindStatusNormal { - skuBind.Stock = JxDefaultStock + skuBind.Stock = model.MaxStoreSkuStockQty } else { skuBind.Stock = 0 } } } - 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) jxPrice := jxutils.CaculatePriceByPricePack(storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage), price) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 4469debb5..fb66c0a57 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -253,10 +253,11 @@ func storeSkuSyncInfo2Bare(inSku *dao.StoreSkuSyncInfo) (outSku *partner.StoreSk VendorSkuID2: utils.Int64ToStr(inSku.JdsWareID), JdsStockSwitch: inSku.JdsStockSwitch, IsDeletedBySku: inSku.IsDeletedBySku, + Stock: inSku.Stock, } - if !isStoreSkuSyncNeedDelete(inSku) { - outSku.Stock = model.MaxStoreSkuStockQty - } + // if !isStoreSkuSyncNeedDelete(inSku) { + // outSku.Stock = model.MaxStoreSkuStockQty + // } return outSku }