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

aa

Browse Source
This commit is contained in:
suyl
2021-06-25 09:55:12 +08:00
parent 469b99849c
commit 51e9cb4304
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/jxstore/cms/store_sku.go
View File

@@ -1110,7 +1110,7 @@ type GetStoresSkusSaleInfoNewResult struct {
SpecUnit string `json:"specUnit"` SpecUnit string `json:"specUnit"`
} }
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) { func GetStoresSkusSaleInfoNew(ctx *jxcontext.Context, storeIDs, skuIDs, skuNameIDs []int, fromTime, toTime string, dataMap map[string]interface{}, sortType int, keyword string, offset, pageSize int) (pageInfo *model.PagedInfo, err error) {
var ( var (
db = dao.GetDB() db = dao.GetDB()
list []*GetStoresSkusSaleInfoNewResult list []*GetStoresSkusSaleInfoNewResult
@@ -1137,10 +1137,10 @@ func GetStoresSkusSaleInfoNew(ctx *jxcontext.Context, vendorIDs, storeIDs, skuID
WHERE a.order_created_at > ? AND a.order_created_at < ? WHERE a.order_created_at > ? AND a.order_created_at < ?
` `
sqlParams := []interface{}{utils.Str2Time(fromTime), utils.Str2Time(toTime)} sqlParams := []interface{}{utils.Str2Time(fromTime), utils.Str2Time(toTime)}
if len(vendorIDs) > 0 { //if len(vendorIDs) > 0 {
sql += " AND a.vendor_id IN (" + dao.GenQuestionMarks(len(vendorIDs)) + ")" // sql += " AND a.vendor_id IN (" + dao.GenQuestionMarks(len(vendorIDs)) + ")"
sqlParams = append(sqlParams, vendorIDs) // sqlParams = append(sqlParams, vendorIDs)
} //}
if len(storeIDs) > 0 { if len(storeIDs) > 0 {
sql += " AND d.id IN (" + dao.GenQuestionMarks(len(storeIDs)) + ")" sql += " AND d.id IN (" + dao.GenQuestionMarks(len(storeIDs)) + ")"
sqlParams = append(sqlParams, storeIDs) sqlParams = append(sqlParams, storeIDs)

6
controllers/cms_store_sku.go
View File

@@ -351,12 +351,12 @@ func (c *StoreSkuController) UpdateStoresSkusSale() {
func (c *StoreSkuController) GetStoresSkusSaleInfo() { func (c *StoreSkuController) GetStoresSkusSaleInfo() {
c.callGetStoresSkusSaleInfo(func(params *tStoreSkuGetStoresSkusSaleInfoParams) (retVal interface{}, errCode string, err error) { c.callGetStoresSkusSaleInfo(func(params *tStoreSkuGetStoresSkusSaleInfoParams) (retVal interface{}, errCode string, err error) {
var ( var (
storeIDs, skuIDs, skuNameIDs, vendorIDs []int storeIDs, skuIDs, skuNameIDs []int
) )
if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.SkuIDs, &skuIDs, params.SkuNameIDs, &skuNameIDs, params.VendorIDs, &vendorIDs); err != nil { if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.SkuIDs, &skuIDs, params.SkuNameIDs, &skuNameIDs); err != nil {
return retVal, "", err return retVal, "", err
} }
retVal, err = cms.GetStoresSkusSaleInfoNew(params.Ctx, vendorIDs, storeIDs, skuIDs, skuNameIDs, params.FromTime, params.ToTime, params.MapData, params.SortType, params.Keyword, params.Offset, params.PageSize) retVal, err = cms.GetStoresSkusSaleInfoNew(params.Ctx, storeIDs, skuIDs, skuNameIDs, params.FromTime, params.ToTime, params.MapData, params.SortType, params.Keyword, params.Offset, params.PageSize)
return retVal, "", err return retVal, "", err
}) })
} }