From 38f703c482d60b8d79dcb4362269d1820c146452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 22 Feb 2021 11:09:43 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/sync2.go | 6 +++---
 business/model/dao/sku.go     | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go
index 8994a3f57..f19c46b32 100644
--- a/business/jxstore/cms/sync2.go
+++ b/business/jxstore/cms/sync2.go
@@ -146,9 +146,9 @@ func SyncSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int,
 			func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 				skuVendorInfo := batchItemList[0].(*dao.StoreSkuSyncInfo)
 				var failedList []*partner.StoreSkuInfoWithErr
-				if skuVendorInfo.VendorCatID == "" {
-					return nil, fmt.Errorf("商品:%d的商家分类没有同步", skuVendorInfo.SkuID)
-				}
+				// if skuVendorInfo.VendorCatID == "" {
+				// 	return nil, fmt.Errorf("商品:%d的商家分类没有同步", skuVendorInfo.SkuID)
+				// }
 				if skuVendorInfo.BindID == 0 {
 					return nil, fmt.Errorf("商品:%d的数据异常", skuVendorInfo.SkuID)
 				}
diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go
index b9d5a0d3d..3c991428d 100644
--- a/business/model/dao/sku.go
+++ b/business/model/dao/sku.go
@@ -291,11 +291,12 @@ func GetSkusWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string, nameIDs
 	tsy.vendor_category_id sku_vendor_map_cat_id
 
 	FROM sku t1
-	LEFT JOIN thing_map t1m ON t1m.thing_id = t1.id AND t1m.thing_type = ?`
+	LEFT JOIN thing_map t1m ON t1m.thing_id = t1.id AND t1m.thing_type = ? AND t1m.deleted_at = ?`
 	sqlParams := []interface{}{
 		model.MimeTypeGif,
 		model.MimeTypeGif,
 		model.ThingTypeSku,
+		utils.DefaultTimeValue,
 	}
 	if len(vendorIDs) > 0 {
 		sql += " AND t1m.vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
@@ -308,7 +309,7 @@ func GetSkusWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string, nameIDs
 	sql += `
 	JOIN sku_name t2 ON t2.id = t1.name_id
 	LEFT JOIN sku_category t3 ON t3.id = t2.category_id
-	LEFT JOIN thing_map t3m ON t3m.thing_id = t3.id AND t3m.thing_type = ?
+	LEFT JOIN thing_map t3m ON t3m.thing_id = t3.id AND t3m.thing_type = ? AND t3m.deleted_at = ?
 		AND t3m.vendor_id = t1m.vendor_id AND t3m.vendor_org_code = t1m.vendor_org_code
 	LEFT JOIN data_resource t11 ON t11.main_url = t2.img
 	LEFT JOIN data_resource t12 ON t12.main_url = t2.img2
@@ -316,7 +317,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, model.VendorIDJD, 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 {