diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 352b2489e..ece2b7af4 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -888,8 +888,8 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode SET t1.last_operator = ?, t1.updated_at = ?, t1.sub_store_id = 0, - t1.price = t0.price * ? / 100, - t1.unit_price = t0.unit_price * ? / 100, + t1.price = IF(t0.price * ? / 100 > 0, t0.price * ? / 100, 1), + t1.unit_price = IF(t0.unit_price * ? / 100 > 0, t0.unit_price * ? / 100, 1), t1.status = t0.status, t1.jd_sync_status = t1.jd_sync_status | ?, t1.elm_sync_status = t1.elm_sync_status | ?, @@ -908,11 +908,13 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode now, pricePercentage, pricePercentage, - model.SyncFlagModifiedMask | model.SyncFlagPriceMask, - model.SyncFlagModifiedMask | model.SyncFlagPriceMask, - model.SyncFlagModifiedMask | model.SyncFlagPriceMask, - model.SyncFlagModifiedMask | model.SyncFlagPriceMask, - model.SyncFlagModifiedMask | model.SyncFlagPriceMask, + pricePercentage, + pricePercentage, + model.SyncFlagModifiedMask | model.SyncFlagPriceMask | model.SyncFlagSaleMask, + model.SyncFlagModifiedMask | model.SyncFlagPriceMask | model.SyncFlagSaleMask, + model.SyncFlagModifiedMask | model.SyncFlagPriceMask | model.SyncFlagSaleMask, + model.SyncFlagModifiedMask | model.SyncFlagPriceMask | model.SyncFlagSaleMask, + model.SyncFlagModifiedMask | model.SyncFlagPriceMask | model.SyncFlagSaleMask, toStoreID, utils.DefaultTimeValue, } @@ -929,7 +931,7 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode sql = ` INSERT INTO store_sku_bind(created_at, updated_at, last_operator, deleted_at, store_id, sku_id, sub_store_id, price, unit_price, status, jd_sync_status, elm_sync_status, wsc_sync_status, ebai_sync_status, mtwm_sync_status) SELECT ?, ?, ?, ?, ?, - t1.sku_id, 0, t1.price * ? / 100, t1.unit_price * ? / 100, t1.status, ?, ?, ?, ?, ? + t1.sku_id, 0, IF(t1.price * ? / 100 > 0, t1.price * ? / 100, 1), IF(t1.unit_price * ? / 100 > 0, t1.unit_price * ? / 100, 1), t1.status, ?, ?, ?, ?, ? FROM store_sku_bind t1 JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ? JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ? @@ -941,6 +943,8 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode now, now, userName, utils.DefaultTimeValue, toStoreID, pricePercentage, pricePercentage, + pricePercentage, + pricePercentage, model.SyncFlagNewMask, model.SyncFlagNewMask, model.SyncFlagNewMask, diff --git a/business/jxutils/excel/excel.go b/business/jxutils/excel/excel.go index 8ab3d32ac..d0d536def 100644 --- a/business/jxutils/excel/excel.go +++ b/business/jxutils/excel/excel.go @@ -72,7 +72,7 @@ func Excel2Slice(reader io.Reader) (contents map[string][][]string) { if excelFile, err := excelize.OpenReader(reader); err == nil { contents = make(map[string][][]string) for _, v := range excelFile.GetSheetMap() { - contents[v] = excelFile.GetRows(v) + contents[v], _ = excelFile.GetRows(v) } } return contents diff --git a/business/jxutils/jxutils_cms.go b/business/jxutils/jxutils_cms.go index 0156071f2..573acd7de 100644 --- a/business/jxutils/jxutils_cms.go +++ b/business/jxutils/jxutils_cms.go @@ -167,6 +167,9 @@ func CaculateSkuPrice(unitPrice int, specQuality float32, specUnit string, skuNa } else if specQuality < 500 { price = price * 110 / 100 } + if price <= 0 { + price = 1 + } return price }