Merge remote-tracking branch 'origin/jdshop' into jxact

business/model/dao/store_sku.go

@@ -565,7 +565,7 @@ func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInf
 	sm.vendor_id, sm.vendor_org_code, sm.yb_app_id, sm.yb_app_key,
 	t1.id bind_id, t1.price, t1.unit_price, t1.status store_sku_status,
 	t1.%s_sync_status sku_sync_status, t1.%s_price vendor_price, t1.%s_lock_time lock_time,
-	t1.store_id, t1.deleted_at bind_deleted_at,
+	t1.store_id, t1.deleted_at bind_deleted_at, t1.stock,
 	t2.*, t2.id sku_id, t2m.vendor_thing_id vendor_sku_id,
 	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, t3.status name_status, t3.ex_prefix, t3.ex_prefix_begin, t3.ex_prefix_end, t3.category_id name_category_id,
 	IF(t11.%s <> '', t11.%s, t3.img) img,
@@ -1455,14 +1455,12 @@ func GetStoreSkuBindByNameID(db *DaoDB, storeID, nameID, status int) (storeSkuBi
 		AND a.name_id = ?
 		AND c.deleted_at = ?
 		AND a.deleted_at = ?
-		AND c.status = ?
 	`
 	sqlParams := []interface{}{
 		storeID,
 		nameID,
 		utils.DefaultTimeValue,
 		utils.DefaultTimeValue,
-		status,
 	}
 	err = GetRows(db, &storeSkuBind, sql, sqlParams...)
 	return storeSkuBind, err

business/model/model.go

@@ -92,7 +92,7 @@ const (
 	SyncFlagSeqMask   = 64 // 门店商家分类下的排序顺序
 
 	// combine
-	SyncFlagStoreSkuOnlyMask     = SyncFlagSaleMask | SyncFlagPriceMask
+	SyncFlagStoreSkuOnlyMask     = SyncFlagSaleMask | SyncFlagPriceMask | SyncFlagStockMask
 	SyncFlagStoreSkuModifiedMask = SyncFlagStoreSkuOnlyMask | SyncFlagModifiedMask
 	SyncFlagChangedMask          = SyncFlagSpecMask | SyncFlagNewMask | SyncFlagDeletedMask | SyncFlagStoreSkuModifiedMask
 )