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

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2022-10-28 14:10:06 +08:00
parent 0e453775de 5bbb724494
commit fc953ffac2
6 changed files with 112 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -346,7 +346,7 @@ func GetSkusWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string, nameIDs
LEFT JOIN sku_vendor_category_map tsy ON tsy.name_id = t2.id AND tsy.vendor_id = ? AND tsy.deleted_at = ?
WHERE 1 = 1
`
sqlParams = append(sqlParams, model.ThingTypeCategory, utils.DefaultTimeValue, utils.DefaultTimeValue, vendorIDs[0], utils.DefaultTimeValue)
sqlParams = append(sqlParams, model.ThingTypeCategory, utils.DefaultTimeValue, utils.DefaultTimeValue, model.VendorIDJD, utils.DefaultTimeValue)
if mustDirty {
sql += " AND t1m.sync_status IS NOT NULL AND t1m.sync_status <> 0"
} else {

5
business/model/dao/thing_map.go
View File

@@ -47,10 +47,11 @@ func GetThingToTiktokMapList(db *DaoDB, vendorId int, thingId int64) (cats []*mo
sql := `
SELECT t1.*
FROM thing_map t1
WHERE thing_id = ? AND vendor_id = ? t1.deleted_at = ?
WHERE t1.thing_id = ? AND t1.vendor_id = ? AND t1.deleted_at = ?
`
sqlParams := []interface{}{
vendorId, thingId,
thingId,
vendorId,
utils.DefaultTimeValue,
}