From 9e21b8ed113e516a32533131206d675101e7163e Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Mon, 7 Jun 2021 18:19:52 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/store_sku.go | 15 ++++++++-------
 controllers/cms_store_sku.go      |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index e2002e31d..936672fbc 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -1103,11 +1103,12 @@ type GetStoresSkusSaleInfoNewResult struct {
 	SaleCount int    `json:"saleCount"` //销量
 }
 
-func GetStoresSkusSaleInfoNew(ctx *jxcontext.Context, vendorIDs, storeIDs, skuIDs, skuNameIDs []int, fromTime, toTime string, saleCountBegin, saleCountEnd, sortType int, keyword string, offset, pageSize int) (pageInfo *model.PagedInfo, err error) {
+func GetStoresSkusSaleInfoNew(ctx *jxcontext.Context, vendorIDs, storeIDs, skuIDs, skuNameIDs []int, fromTime, toTime string, dataMap map[string]interface{}, sortType int, keyword string, offset, pageSize int) (pageInfo *model.PagedInfo, err error) {
 	var (
 		db   = dao.GetDB()
 		list []*GetStoresSkusSaleInfoNewResult
 	)
+	db.Db = orm.NewOrmUsingDB("c4beta")
 	if len(storeIDs) == 0 && len(skuIDs) == 0 && keyword == "" {
 		return nil, fmt.Errorf("请至少输入一个条件查询！")
 	}
@@ -1147,18 +1148,18 @@ func GetStoresSkusSaleInfoNew(ctx *jxcontext.Context, vendorIDs, storeIDs, skuID
 		sqlParams = append(sqlParams, "%"+keyword+"%", "%"+keyword+"%", keyword, keyword)
 	}
 	sql += " GROUP BY  1, 2, 3, 4, 5"
-	if saleCountBegin != 0 || saleCountEnd != 0 {
+	if dataMap["saleCountBegin"] != nil || dataMap["saleCountEnd"] != nil {
 		sql += " HAVING"
-		if saleCountBegin != 0 {
+		if dataMap["saleCountBegin"] != nil {
 			sql += " sale_count >= ?"
-			sqlParams = append(sqlParams, saleCountBegin)
+			sqlParams = append(sqlParams, utils.MustInterface2Int64(dataMap["saleCountBegin"]))
 		}
-		if saleCountBegin != 0 && saleCountEnd != 0 {
+		if dataMap["saleCountBegin"] != nil && dataMap["saleCountEnd"] != nil {
 			sql += " AND"
 		}
-		if saleCountEnd != 0 {
+		if dataMap["saleCountEnd"] != nil {
 			sql += " sale_count <= ?"
-			sqlParams = append(sqlParams, saleCountEnd)
+			sqlParams = append(sqlParams, utils.MustInterface2Int64(dataMap["saleCountEnd"]))
 		}
 	}
 
diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go
index afe1a50f7..854fcf1ae 100644
--- a/controllers/cms_store_sku.go
+++ b/controllers/cms_store_sku.go
@@ -357,7 +357,7 @@ func (c *StoreSkuController) GetStoresSkusSaleInfo() {
 		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.SkuIDs, &skuIDs, params.SkuNameIDs, &skuNameIDs, params.VendorIDs, &vendorIDs); err != nil {
 			return retVal, "", err
 		}
-		retVal, err = cms.GetStoresSkusSaleInfoNew(params.Ctx, vendorIDs, storeIDs, skuIDs, skuNameIDs, params.FromTime, params.ToTime, params.SaleCountBegin, params.SaleCountEnd, params.SortType, params.Keyword, params.Offset, params.PageSize)
+		retVal, err = cms.GetStoresSkusSaleInfoNew(params.Ctx, vendorIDs, storeIDs, skuIDs, skuNameIDs, params.FromTime, params.ToTime, params.MapData, params.SortType, params.Keyword, params.Offset, params.PageSize)
 		return retVal, "", err
 	})
 }