liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复GetStoresSkusNew中，在全取数据时，获取活动信息不正确的问题

Browse Source
This commit is contained in:
gazebo
2019-10-14 09:57:02 +08:00
parent 2042e01c61
commit 9b7be29441
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxstore/cms/store_sku.go
View File

@@ -371,9 +371,7 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo
return nil, err
}
pageSize = jxutils.FormalizePageSize(pageSize)
if offset < 0 {
offset = 0
}
offset = jxutils.FormalizePageOffset(offset)
sqlOffset := offset
sqlPageSize := pageSize
isSaleInfo := params["stFromTime"] != nil
@@ -396,7 +394,7 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo
}
skuNamesInfo = &StoreSkuNamesInfo{}
if !isBySku && sqlPageSize < 1000 {
if !isBySku && sqlPageSize != model.UnlimitedPageSize {
sql2 := `
SELECT SQL_CALC_FOUND_ROWS
t3.id store_id, t1.id name_id
@@ -481,7 +479,7 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo
globals.SugarLogger.Debugf("GetStoresSkusNew updateSaleInfo4StoreSkuName:%v", time.Now().Sub(beginTime))
}
if err == nil {
if !(offset == 0 && pageSize == model.UnlimitedPageSize) {
if true { //!(offset == 0 && pageSize == model.UnlimitedPageSize) {
storeIDs, skuIDs = GetStoreAndSkuIDsFromInfo(skuNamesInfo)
}
beginTime := time.Now()