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

库存修改 测试

Browse Source
This commit is contained in:
苏尹岚
2020-08-03 17:02:37 +08:00
parent e2fe8d6b08
commit 6945edecbc
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
business/jxstore/cms/store_sku.go
View File

@@ -54,8 +54,6 @@ const (
CopyStoreSkuModeFresh = "fresh" // 全新复制 CopyStoreSkuModeFresh = "fresh" // 全新复制
CopyStoreSkuModeUpdate = "update" // 增量复制 CopyStoreSkuModeUpdate = "update" // 增量复制
CopyStoreSkuModeUpdatePrice = "updatePrice" // 增量复制价格 CopyStoreSkuModeUpdatePrice = "updatePrice" // 增量复制价格
JxDefaultStock = 99999
) )
//通用写入Excel //通用写入Excel
@@ -1165,7 +1163,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
skuBind.Status = tmpStatus skuBind.Status = tmpStatus
//关注设置默认库存 //关注设置默认库存
if tmpStatus == model.StoreSkuBindStatusNormal { if tmpStatus == model.StoreSkuBindStatusNormal {
skuBind.Stock = JxDefaultStock skuBind.Stock = model.MaxStoreSkuStockQty
} else { } else {
skuBind.Stock = 0 skuBind.Stock = 0
} }
@@ -1243,25 +1241,26 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
// updateFieldMap["UnitPrice"] = 1 // updateFieldMap["UnitPrice"] = 1
// updateFieldMap["Price"] = 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 := getSkuSaleStatus(inSkuBind, skuBindInfo); tmpStatus != model.StoreSkuBindStatusNA {
if tmpStatus != skuBind.Status { if tmpStatus != skuBind.Status {
updateFieldMap[model.FieldStatus] = 1 updateFieldMap[model.FieldStatus] = 1
} }
skuBind.Status = tmpStatus skuBind.Status = tmpStatus
setStoreSkuBindStatus(skuBind, model.SyncFlagSaleMask) setStoreSkuBindStatus(skuBind, model.SyncFlagSaleMask)
setStoreSkuBindStatus(skuBind, model.SyncFlagStockMask)
if inSkuBind.Stock == nil { if inSkuBind.Stock == nil {
if tmpStatus == model.StoreSkuBindStatusNormal { if tmpStatus == model.StoreSkuBindStatusNormal {
skuBind.Stock = JxDefaultStock skuBind.Stock = model.MaxStoreSkuStockQty
} else { } else {
skuBind.Stock = 0 skuBind.Stock = 0
} }
} }
} }
if inSkuBind.Stock != nil {
updateFieldMap["Stock"] = 1
skuBind.Stock = *inSkuBind.Stock
setStoreSkuBindStatus(skuBind, model.SyncFlagStockMask)
}
if skuBindInfo.UnitPrice != 0 && isCanChangePrice { // 这里是否需要加此条件限制 if skuBindInfo.UnitPrice != 0 && isCanChangePrice { // 这里是否需要加此条件限制
price := jxutils.CaculateSkuPrice(unitPrice, v.SpecQuality, v.SpecUnit, v.SkuNameUnit) price := jxutils.CaculateSkuPrice(unitPrice, v.SpecQuality, v.SpecUnit, v.SkuNameUnit)
jxPrice := jxutils.CaculatePriceByPricePack(storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage), price) jxPrice := jxutils.CaculatePriceByPricePack(storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage), price)

7
business/jxstore/cms/sync_store_sku.go
View File

@@ -253,10 +253,11 @@ func storeSkuSyncInfo2Bare(inSku *dao.StoreSkuSyncInfo) (outSku *partner.StoreSk
VendorSkuID2: utils.Int64ToStr(inSku.JdsWareID), VendorSkuID2: utils.Int64ToStr(inSku.JdsWareID),
JdsStockSwitch: inSku.JdsStockSwitch, JdsStockSwitch: inSku.JdsStockSwitch,
IsDeletedBySku: inSku.IsDeletedBySku, IsDeletedBySku: inSku.IsDeletedBySku,
Stock: inSku.Stock,
} }
if !isStoreSkuSyncNeedDelete(inSku) { // if !isStoreSkuSyncNeedDelete(inSku) {
outSku.Stock = model.MaxStoreSkuStockQty // outSku.Stock = model.MaxStoreSkuStockQty
} // }
return outSku return outSku
} }