只有库中可售的商品才可以关注

This commit is contained in:
gazebo
2019-10-31 15:49:17 +08:00
parent 4f8ded0153
commit 36a505fb32

View File

@@ -123,6 +123,8 @@ type StoreSkuBindInfo struct {
type tStoreSkuBindAndSpec struct { type tStoreSkuBindAndSpec struct {
model.StoreSkuBind model.StoreSkuBind
SkuStatus int
SkuNameStatus int
Name string Name string
SpecQuality float32 SpecQuality float32
SpecUnit string SpecUnit string
@@ -924,12 +926,12 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
sql := ` sql := `
SELECT SELECT
t2.*, t2.*,
t1.id real_sku_id, t1.spec_quality, t1.spec_unit,` t1.id real_sku_id, t1.status sku_status, t1.spec_quality, t1.spec_unit,`
if needGetExistingUnitPrice { if needGetExistingUnitPrice {
sql += " IF(t5.unit_price > 0, t5.unit_price, t3.price) sku_name_price," sql += " IF(t5.unit_price > 0, t5.unit_price, t3.price) sku_name_price,"
} }
sql += ` sql += `
t3.unit sku_name_unit, t3.name t3.unit sku_name_unit, t3.name, t3.status sku_name_status
FROM sku t1 FROM sku t1
JOIN store ts ON ts.id = ? AND ts.deleted_at = ? JOIN store ts ON ts.id = ? AND ts.deleted_at = ?
LEFT JOIN store_sku_bind t2 ON t2.sku_id = t1.id AND t2.store_id = ts.id AND t2.deleted_at = ? LEFT JOIN store_sku_bind t2 ON t2.sku_id = t1.id AND t2.store_id = ts.id AND t2.deleted_at = ?
@@ -982,7 +984,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
// globals.SugarLogger.Debug(utils.Format4Output(inSkuBind, false)) // globals.SugarLogger.Debug(utils.Format4Output(inSkuBind, false))
var skuBind *model.StoreSkuBind var skuBind *model.StoreSkuBind
if v.ID == 0 { if v.ID == 0 {
if skuBindInfo.IsFocus == 1 { if skuBindInfo.IsFocus == 1 && v.SkuNameStatus == model.SkuStatusNormal && v.SkuStatus == model.SkuStatusNormal {
skuBind = &model.StoreSkuBind{ skuBind = &model.StoreSkuBind{
StoreID: storeID, StoreID: storeID,
SkuID: v.RealSkuID, SkuID: v.RealSkuID,