From 2df049098d80cf1f8a688a1dd02160b5364d4351 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 12 Jun 2019 15:00:54 +0800 Subject: [PATCH] =?UTF-8?q?-=20dao.SetStoreSkuSyncStatus=E4=B8=AD=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E5=87=BD=E6=95=B0=E4=B9=8B=E5=89=8D=E6=98=AF=E8=A6=81?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B2=A1=E6=9C=89=E5=88=A0=E9=99=A4=E6=88=96?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=A0=87=E5=BF=97=E4=B8=8D=E4=B8=BA0?= =?UTF-8?q?=E7=9A=84=EF=BC=8C=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=B0=86=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=A0=87=E5=BF=97=E4=B8=8D=E4=B8=BA0=E4=B8=94?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E7=9A=84=E6=8A=8A=E6=A0=87=E5=BF=97?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=EF=BC=8C=E7=8E=B0=E5=9C=A8=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=8F=AA=E8=AE=BE=E7=BD=AE=E6=B2=A1=E6=9C=89=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/dao/store_sku.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 05ea5016b..2d8a62b83 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -269,6 +269,7 @@ func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInf return skus, err } +// 这个函数之前是要设置没有删除或同步标志不为0的，会导致将同步标志不为0且删除了的把标志去掉，现在改为只设置没有删除的 func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int, syncStatus int) (num int64, err error) { globals.SugarLogger.Debugf("SetStoreSkuSyncStatus, storeIDs:%v, vendorID:%d", storeIDs, vendorID) @@ -276,14 +277,13 @@ func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID]) sql := ` UPDATE store_sku_bind t1 - SET t1.%s_sync_status = IF(t1.deleted_at = ?, t1.%s_sync_status | ?, 0) + SET t1.%s_sync_status = t1.%s_sync_status | ? ` fmtParams := []interface{}{ fieldPrefix, fieldPrefix, } sqlParams := []interface{}{ - utils.DefaultTimeValue, syncStatus, } if isSingleStorePF && (syncStatus&model.SyncFlagNewMask) != 0 { @@ -292,8 +292,8 @@ func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int ` fmtParams = append(fmtParams, fieldPrefix) } - sql += " WHERE (t1.deleted_at = ? OR t1.%s_sync_status <> 0)" - fmtParams = append(fmtParams, fieldPrefix) + sql += " WHERE (t1.deleted_at = ?)" + // fmtParams = append(fmtParams, fieldPrefix) sqlParams = append(sqlParams, utils.DefaultTimeValue) if len(storeIDs) > 0 { sql += " AND t1.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"