From c05c826cd963d9b3a2744fdedec6b21eb4c6fbae 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:03:13 +0800
Subject: [PATCH] aa

---
 business/model/dao/sku.go | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go
index 5a2169c11..b9d5a0d3d 100644
--- a/business/model/dao/sku.go
+++ b/business/model/dao/sku.go
@@ -1,7 +1,6 @@
 package dao
 
 import (
-	"fmt"
 	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/aliupcapi"
@@ -292,12 +291,11 @@ 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 = ? AND t1m.deleted_at = ?`
+	LEFT JOIN thing_map t1m ON t1m.thing_id = t1.id AND t1m.thing_type = ?`
 	sqlParams := []interface{}{
 		model.MimeTypeGif,
 		model.MimeTypeGif,
 		model.ThingTypeSku,
-		utils.DefaultTimeValue,
 	}
 	if len(vendorIDs) > 0 {
 		sql += " AND t1m.vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
@@ -310,7 +308,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 = ? AND t3m.deleted_at = ?
+	LEFT JOIN thing_map t3m ON t3m.thing_id = t3.id AND t3m.thing_type = ?
 		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
@@ -318,7 +316,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, model.VendorIDJD, utils.DefaultTimeValue)
+	sqlParams = append(sqlParams, model.ThingTypeCategory, utils.DefaultTimeValue, model.VendorIDJD, utils.DefaultTimeValue)
 	if mustDirty {
 		sql += " AND t1m.sync_status IS NOT NULL AND t1m.sync_status <> 0"
 	} else {
@@ -334,8 +332,6 @@ func GetSkusWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string, nameIDs
 		sqlParams = append(sqlParams, skuIDs)
 	}
 	sql += " ORDER BY t1.seq"
-	fmt.Println(sql)
-	fmt.Println(sqlParams)
 	if err = GetRows(db, &skuList, sql, sqlParams...); err == nil {
 		skuPlaceList, err2 := GetSkuNamePlaces(db, nameIDs, skuIDs)
 		if err = err2; err == nil {