查询商品库修改

business/jxstore/cms/sku.go

@@ -666,8 +666,6 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku, isQueryMidPric
 	}()
 	// globals.SugarLogger.Debug(sqlData)
 	// globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false))
-	fmt.Println(sqlData)
-	fmt.Println(sqlParams)
 	if err = dao.GetRows(db, &skuNamesInfo.SkuNames, sqlData, sqlParams...); err == nil {
 		skuNamesInfo.TotalCount = dao.GetLastTotalRowCount(db)
 		dao.Commit(db)
@@ -1875,7 +1873,7 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 					retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "商品的条码不能为空！")}
 					return retVal, err
 				}
-				skuNames, _ := dao.GetSkuNames(db, nil, []string{*v.Upc}, "")
+				skuNames, _ := dao.GetSkuNames(db, nil, []string{*v.Upc}, "", false)
 				if len(skuNames) > 0 {
 					retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "商品在京西库中已存在！")}
 					return retVal, err
@@ -1971,7 +1969,7 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
 							return retVal, err
 						}
 					}
-					skuNames2, _ := dao.GetSkuNames(db, nil, nil, productInfo.Name)
+					skuNames2, _ := dao.GetSkuNames(db, nil, nil, productInfo.Name, false)
 					if len(skuNames2) > 1 {
 						retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "此商品名在京西库中查询出了大于1个商品！")}
 						return retVal, err

business/jxstore/cms/store_sku.go

@@ -4086,7 +4086,7 @@ func CreateSkusAndFocusFromYb(ctx *jxcontext.Context, isAsync, isContinueWhenErr
 				//长度大于7就可能是标品，非标品一般是7位，前三位是yb_store_prefix后4位是yb_name_suffix
 				if len(v.YbBarCode) > 7 {
 					if localSkuMap[v.SkuList[0].VendorSkuID] == nil {
-						skuNames, err := dao.GetSkuNames(db, nil, []string{v.YbBarCode}, "")
+						skuNames, err := dao.GetSkuNames(db, nil, []string{v.YbBarCode}, "", false)
 						if err != nil {
 							return retVal, err
 						}
@@ -4097,7 +4097,7 @@ func CreateSkusAndFocusFromYb(ctx *jxcontext.Context, isAsync, isContinueWhenErr
 							err = err2
 							//表示用upc也没有找到这个商品，则再尝试用银豹上的名字去查
 							if len(productInfos) == 0 {
-								skuNames2, err := dao.GetSkuNames(db, nil, nil, v.Name)
+								skuNames2, err := dao.GetSkuNames(db, nil, nil, v.Name, false)
 								if err != nil {
 									return retVal, err
 								}
@@ -4112,7 +4112,7 @@ func CreateSkusAndFocusFromYb(ctx *jxcontext.Context, isAsync, isContinueWhenErr
 								}
 							} else {
 								productInfo := productInfos[0]
-								skuNames2, err := dao.GetSkuNames(db, nil, nil, productInfo.Name)
+								skuNames2, err := dao.GetSkuNames(db, nil, nil, productInfo.Name, false)
 								if err != nil {
 									return retVal, err
 								}
@@ -4222,12 +4222,12 @@ func CreateSkusAndFocusFromWx(ctx *jxcontext.Context, productInfo *jdapi.Product
 			err = nil
 		}
 	}
-	skuNames, err := dao.GetSkuNames(db, nil, []string{productInfo.UpcCode}, "")
+	skuNames, err := dao.GetSkuNames(db, nil, []string{productInfo.UpcCode}, "", false)
 	if err != nil {
 		return err
 	}
 	if len(skuNames) == 0 {
-		skuNames2, err := dao.GetSkuNames(db, nil, nil, productInfo.Name)
+		skuNames2, err := dao.GetSkuNames(db, nil, nil, productInfo.Name, false)
 		if err != nil {
 			return err
 		}

business/jxstore/misc/store_sku_sales.go

@@ -153,7 +153,7 @@ func GetStoreSkuSalesInfo(ctx *jxcontext.Context, storeID int) (outStoreSkuSales
 			storeSkuSales.SkuImage = storeSkuInfo.Img
 			storeSkuSales.SkuPrice = jxutils.IntPrice2StandardCurrencyString(int64(storeSkuInfo.Skus[0].BindPrice))
 		} else if skuAndNameInfo != nil {
-			skuNameList, err := dao.GetSkuNames(db, []int{skuAndNameInfo.NameID}, nil, "")
+			skuNameList, err := dao.GetSkuNames(db, []int{skuAndNameInfo.NameID}, nil, "", false)
 			prefix := ""
 			if err == nil && len(skuNameList) > 0 {
 				storeSkuSales.SkuImage = skuNameList[0].Img

business/model/dao/sku.go

@@ -122,10 +122,11 @@ func GetSkus(db *DaoDB, skuIDs, nameIDs, statuss, catIDs []int, eclpIDs []string
 	return nil, err
 }
 
-func GetSkuNames(db *DaoDB, nameIDs []int, upcs []string, name string) (skuNameList []*model.SkuName, err error) {
+func GetSkuNames(db *DaoDB, nameIDs []int, upcs []string, name string, isExd bool) (skuNameList []*model.SkuName, err error) {
 	sql := `
 	SELECT *
 	FROM sku_name t1
+	LEFT JOIN sku t2 JOIN t2.name_id = t1.id 
 	WHERE t1.deleted_at = ?
 	`
 	sqlParams := []interface{}{
@@ -143,6 +144,9 @@ func GetSkuNames(db *DaoDB, nameIDs []int, upcs []string, name string) (skuNameL
 		sql += " AND t1.name LIKE ?"
 		sqlParams = append(sqlParams, "%"+name+"%")
 	}
+	if !isExd {
+		sql += " AND t2.exd_sku_id <> ''"
+	}
 	if err = GetRows(db, &skuNameList, sql, sqlParams...); err == nil {
 		return skuNameList, nil
 	}