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

2019-12-25 11:44:25 +08:00
parent 54fb48e6f1 b8701ca850
commit f924735152
3 changed files with 21 additions and 9 deletions
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -1133,12 +1133,13 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 	return skuIDs, err
 }

-func getSkuSaleStatus(inSkuBind *StoreSkuBindSkuInfo, skuBindInfo *StoreSkuBindInfo) int {
+func getSkuSaleStatus(inSkuBind *StoreSkuBindSkuInfo, skuNameBindInfo *StoreSkuBindInfo) int {
 	tempSale := 0
 	if inSkuBind != nil {
 		tempSale = inSkuBind.IsSale
-	} else {
-		tempSale = skuBindInfo.IsSale
+	}
+	if tempSale == 0 {
+		tempSale = skuNameBindInfo.IsSale
 	}
 	if tempSale == -1 {
 		return model.StoreSkuBindStatusDontSale