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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-12 15:43:06 +08:00
parent b93fba4bb5
commit 3cb0904e6f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxstore/cms/sync2.go
View File

@@ -613,7 +613,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask,
if err = err2; err == nil { if err = err2; err == nil {
remoteCatMap := make(map[string]int) remoteCatMap := make(map[string]int)
cat2Delete = checkRemoteCatExist(remoteCatMap, localCatMap, remoteCatList) cat2Delete = checkRemoteCatExist(remoteCatMap, localCatMap, remoteCatList)
fmt.Println("1111111111111111111111111111", utils.Format4Output(localCatList, false))
for _, v := range localCatList { for _, v := range localCatList {
if v.IsExdSpec == model.NO { if v.IsExdSpec == model.NO {
if v.MapID != 0 { if v.MapID != 0 {

3
business/model/dao/sku.go
View File

@@ -1,6 +1,7 @@
package dao package dao
import ( import (
"fmt"
"time" "time"
"git.rosy.net.cn/baseapi/platformapi/aliupcapi" "git.rosy.net.cn/baseapi/platformapi/aliupcapi"
@@ -257,6 +258,8 @@ func GetSkuCategoryWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string,
sqlParams = append(sqlParams, appOrgCodes) sqlParams = append(sqlParams, appOrgCodes)
} }
sql += " ORDER BY t1.seq" sql += " ORDER BY t1.seq"
fmt.Println(sql)
fmt.Println(sqlParams)
err = GetRows(db, &catList, sql, sqlParams...) err = GetRows(db, &catList, sql, sqlParams...)
return catList, err return catList, err
} }