diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go index 9fc878154..20b8c9c28 100644 --- a/business/jxstore/report/report.go +++ b/business/jxstore/report/report.go @@ -36,7 +36,7 @@ type tStoreSkuBindAndSkuName struct { UnitPriceList []int } -func GetStatisticsReportForOrders(ctx *jxcontext.Context, storeIDs, vendorIDs []int, fromDate string, toDate string) (statisticsReportForOrdersList []*dao.StatisticsReportForOrdersList, err error) { +func GetStatisticsReportForOrders(ctx *jxcontext.Context, storeIDs, vendorIDs []int, fromDate, toDate, marketPhone, jdPhone, mtPhone, ebaiPhone string) (statisticsReportForOrdersList []*dao.StatisticsReportForOrdersList, err error) { db := dao.GetDB() fromDateParm := utils.Str2Time(fromDate) toDateParm := utils.Str2Time(toDate) @@ -44,7 +44,7 @@ func GetStatisticsReportForOrders(ctx *jxcontext.Context, storeIDs, vendorIDs [] if math.Ceil(toDateParm.Sub(fromDateParm).Hours()/24) > 92 { return nil, errors.New(fmt.Sprintf("查询间隔时间不允许大于3个月!: 时间范围:[%v] 至 [%v]", fromDate, toDate)) } - statisticsReportForOrdersList, err = dao.GetStatisticsReportForOrders(db, storeIDs, vendorIDs, fromDateParm, toDateParm) + statisticsReportForOrdersList, err = dao.GetStatisticsReportForOrders(db, storeIDs, vendorIDs, fromDateParm, toDateParm, marketPhone, jdPhone, mtPhone, ebaiPhone) return statisticsReportForOrdersList, err } diff --git a/business/model/dao/report.go b/business/model/dao/report.go index 432dbcbd9..806fd3b1c 100644 --- a/business/model/dao/report.go +++ b/business/model/dao/report.go @@ -50,7 +50,7 @@ type PriceReferSnapshotExt struct { } //查询统计订单信息 -func GetStatisticsReportForOrders(db *DaoDB, storeIDs, vendorIDs []int, fromDate time.Time, toDate time.Time) (statisticsReportForOrdersList []*StatisticsReportForOrdersList, err error) { +func GetStatisticsReportForOrders(db *DaoDB, storeIDs, vendorIDs []int, fromDate time.Time, toDate time.Time, marketPhone, jdPhone, mtPhone, ebaiPhone string) (statisticsReportForOrdersList []*StatisticsReportForOrdersList, err error) { sql := ` SELECT c.id store_id, @@ -136,6 +136,22 @@ func GetStatisticsReportForOrders(db *DaoDB, storeIDs, vendorIDs []int, fromDate sql += ` WHERE c.id IN (` + GenQuestionMarks(len(storeIDs)) + `)` sqlParams = append(sqlParams, storeIDs) } + if marketPhone != "" { + sql += ` WHERE c.market_man_phone = ?` + sqlParams = append(sqlParams, marketPhone) + } + if jdPhone != "" { + sql += ` WHERE c.operator_phone = ?` + sqlParams = append(sqlParams, marketPhone) + } + if mtPhone != "" { + sql += ` WHERE c.operator_phone2 = ?` + sqlParams = append(sqlParams, marketPhone) + } + if ebaiPhone != "" { + sql += ` WHERE c.operator_phone3 = ?` + sqlParams = append(sqlParams, marketPhone) + } if err = GetRows(db, &statisticsReportForOrdersList, sql, sqlParams...); err == nil { return statisticsReportForOrdersList, nil } diff --git a/controllers/jx_report.go b/controllers/jx_report.go index 3e6f65651..f8d3b15c3 100644 --- a/controllers/jx_report.go +++ b/controllers/jx_report.go @@ -30,7 +30,7 @@ func (c *ReportController) StatisticsReportForOrders() { c.callStatisticsReportForOrders(func(params *tReportStatisticsReportForOrdersParams) (retVal interface{}, errCode string, err error) { var storeIDList, vendorIDs []int if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDList, params.VendorIDs, &vendorIDs); err == nil { - retVal, err = report.GetStatisticsReportForOrders(params.Ctx, storeIDList, vendorIDs, params.FromDate, params.ToDate) + retVal, err = report.GetStatisticsReportForOrders(params.Ctx, storeIDList, vendorIDs, params.FromDate, params.ToDate, params.MarketManPhone, params.JdPhone, params.MtPhone, params.EbaiPhone) } return retVal, "", err })