Merge remote-tracking branch 'origin/mark' into su

business/model/dao/store_sku.go

@@ -286,10 +286,11 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 		sql += " AND t1.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
 		sqlParams = append(sqlParams, skuIDs)
 	}
-	if !isSingleStorePF {
-		sql += " AND t2.%s_id <> 0"
-		fmtParams = append(fmtParams, fieldPrefix)
-	}
+	// 多门店平台没有成功创建的商品，不直接过滤，让上层同步时报错
+	// if !isSingleStorePF {
+	// 	sql += " AND t2.%s_id <> 0"
+	// 	fmtParams = append(fmtParams, fieldPrefix)
+	// }
 	sql = fmt.Sprintf(sql, fmtParams...)
 	sql += " ORDER BY t1.price"
 	// globals.SugarLogger.Debug(sql)

business/model/store.go

@@ -43,8 +43,9 @@ const (
 )
 
 const (
-	StoreChangePriceTypeDirect      = 0
-	StoreChangePriceTypeNeedApprove = 1
+	StoreChangePriceTypeDirect       = 0
+	StoreChangePriceTypeNeedApprove  = 1
+	StoreChangePriceTypeBossDisabled = 2
 )
 
 var (