diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index e8d7654a4..936b0ffa6 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -4457,8 +4457,8 @@ func RefreshJdsSkusStatus(ctx *jxcontext.Context) (err error) { return err } -func GetStoreSkuAudit(ctx *jxcontext.Context, storeIDs, nameIDs, skuIDs, statuss []int, name, remark string, applyTimeStart, applyTimeEnd, auditTimeStart, auditTimeEnd string, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { - pagedInfo, err = dao.GetStoreSkuAudit(dao.GetDB(), storeIDs, nameIDs, skuIDs, statuss, name, remark, utils.Str2Time(applyTimeStart), utils.Str2Time(applyTimeEnd), utils.Str2Time(auditTimeStart), utils.Str2Time(auditTimeEnd), pageSize, offset) +func GetStoreSkuAudit(ctx *jxcontext.Context, storeIDs, nameIDs, skuIDs, statuss []int, name, remark string, changeType int, applyTimeStart, applyTimeEnd, auditTimeStart, auditTimeEnd string, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { + pagedInfo, err = dao.GetStoreSkuAudit(dao.GetDB(), storeIDs, nameIDs, skuIDs, statuss, name, remark, changeType, utils.Str2Time(applyTimeStart), utils.Str2Time(applyTimeEnd), utils.Str2Time(auditTimeStart), utils.Str2Time(auditTimeEnd), pageSize, offset) return pagedInfo, err } diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 13d7557e8..45f49093f 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -1541,7 +1541,7 @@ type tStoreSkuAudit struct { StoreName string `json:"storeName"` } -func GetStoreSkuAudit(db *DaoDB, storeIDs, nameIDs, skuIDs, statuss []int, name, remark string, applyTimeStart, applyTimeEnd, auditTimeStart, auditTimeEnd time.Time, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { +func GetStoreSkuAudit(db *DaoDB, storeIDs, nameIDs, skuIDs, statuss []int, name, remark string, changeType int, applyTimeStart, applyTimeEnd, auditTimeStart, auditTimeEnd time.Time, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { var requestList []*tStoreSkuAudit sql := ` SELECT SQL_CALC_FOUND_ROWS a.*, c.*, d.name store_name @@ -1580,6 +1580,10 @@ func GetStoreSkuAudit(db *DaoDB, storeIDs, nameIDs, skuIDs, statuss []int, name, sql += " AND a.updated_at BETWEEN ? AND ?" sqlParams = append(sqlParams, applyTimeStart, applyTimeEnd) } + if changeType != 0 { + sql += " AND a.type = ? " + sqlParams = append(sqlParams, changeType) + } sql += " LIMIT ? OFFSET ?" pageSize = jxutils.FormalizePageSize(pageSize) sqlParams = append(sqlParams, pageSize, offset) diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index 1579b832f..6c0d91e62 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -824,6 +824,7 @@ func (c *StoreSkuController) SyncMatterC4ToGy() { // @Param storeIDs query string false "门店ID列表" // @Param nameIDs query string false "id列表对象,当前指skuname id" // @Param statuss query string false "审核状态" +// @Param type query int false "改价类型,1是普通改价,2是关注" // @Param offset query int false "门店列表起始序号(以0开始,缺省为0)" // @Param pageSize query int false "门店列表页大小(缺省为50,-1表示全部)" // @Success 200 {object} controllers.CallResult @@ -837,7 +838,7 @@ func (c *StoreSkuController) GetStoreSkuAudit() { if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.NameIDs, &nameIDs, params.Statuss, &statuss); err != nil { return retVal, "", err } - retVal, err = cms.GetStoreSkuAudit(params.Ctx, storeIDs, nameIDs, nil, statuss, params.Name, params.Remark, params.ApplyTimeStart, params.ApplyTimeEnd, params.AuditTimeStart, params.AuditTimeEnd, params.PageSize, params.Offset) + retVal, err = cms.GetStoreSkuAudit(params.Ctx, storeIDs, nameIDs, nil, statuss, params.Name, params.Remark, params.Type, params.ApplyTimeStart, params.ApplyTimeEnd, params.AuditTimeStart, params.AuditTimeEnd, params.PageSize, params.Offset) return retVal, "", err }) }