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:
苏尹岚
2021-03-19 14:26:42 +08:00
parent ee63b713de
commit 6446b02cdc
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/report/report.go
View File

@@ -34,7 +34,7 @@ type tStoreSkuBindAndSkuName struct {
UnitPriceList []int UnitPriceList []int
} }
func GetStatisticsReportForOrders(ctx *jxcontext.Context, storeIDs []int, fromDate string, toDate string) (statisticsReportForOrdersList []*dao.StatisticsReportForOrdersList, err error) { func GetStatisticsReportForOrders(ctx *jxcontext.Context, storeIDs, vendorIDs []int, fromDate string, toDate string) (statisticsReportForOrdersList []*dao.StatisticsReportForOrdersList, err error) {
db := dao.GetDB() db := dao.GetDB()
fromDateParm := utils.Str2Time(fromDate) fromDateParm := utils.Str2Time(fromDate)
toDateParm := utils.Str2Time(toDate) toDateParm := utils.Str2Time(toDate)
@@ -42,7 +42,7 @@ func GetStatisticsReportForOrders(ctx *jxcontext.Context, storeIDs []int, fromDa
if math.Ceil(toDateParm.Sub(fromDateParm).Hours()/24) > 92 { if math.Ceil(toDateParm.Sub(fromDateParm).Hours()/24) > 92 {
return nil, errors.New(fmt.Sprintf("查询间隔时间不允许大于3个月！: 时间范围：[%v] 至 [%v]", fromDate, toDate)) return nil, errors.New(fmt.Sprintf("查询间隔时间不允许大于3个月！: 时间范围：[%v] 至 [%v]", fromDate, toDate))
} }
statisticsReportForOrdersList, err = dao.GetStatisticsReportForOrders(db, storeIDs, fromDateParm, toDateParm) statisticsReportForOrdersList, err = dao.GetStatisticsReportForOrders(db, storeIDs, vendorIDs, fromDateParm, toDateParm)
return statisticsReportForOrdersList, err return statisticsReportForOrdersList, err
} }

6
business/model/dao/report.go
View File

@@ -50,7 +50,7 @@ type PriceReferSnapshotExt struct {
} }
//查询统计订单信息 //查询统计订单信息
func GetStatisticsReportForOrders(db *DaoDB, storeIDs []int, fromDate time.Time, toDate time.Time) (statisticsReportForOrdersList []*StatisticsReportForOrdersList, err error) { func GetStatisticsReportForOrders(db *DaoDB, storeIDs, vendorIDs []int, fromDate time.Time, toDate time.Time) (statisticsReportForOrdersList []*StatisticsReportForOrdersList, err error) {
sql := ` sql := `
SELECT SELECT
c.id store_id, c.id store_id,
@@ -113,6 +113,10 @@ func GetStatisticsReportForOrders(db *DaoDB, storeIDs []int, fromDate time.Time,
sql += ` AND IF(a.jx_store_id != 0, a.jx_store_id, a.store_id) IN(` + GenQuestionMarks(len(storeIDs)) + `)` sql += ` AND IF(a.jx_store_id != 0, a.jx_store_id, a.store_id) IN(` + GenQuestionMarks(len(storeIDs)) + `)`
sqlParams = append(sqlParams, storeIDs) sqlParams = append(sqlParams, storeIDs)
} }
if len(vendorIDs) > 0 {
sql += ` AND a.vendor_id IN(` + GenQuestionMarks(len(vendorIDs)) + `)`
sqlParams = append(sqlParams, vendorIDs)
}
sql += ` sql += `
GROUP BY 1 GROUP BY 1
)s )s

6
controllers/jx_report.go
View File

@@ -24,9 +24,9 @@ type ReportController struct {
// @router /StatisticsReportForOrders [post] // @router /StatisticsReportForOrders [post]
func (c *ReportController) StatisticsReportForOrders() { func (c *ReportController) StatisticsReportForOrders() {
c.callStatisticsReportForOrders(func(params *tReportStatisticsReportForOrdersParams) (retVal interface{}, errCode string, err error) { c.callStatisticsReportForOrders(func(params *tReportStatisticsReportForOrdersParams) (retVal interface{}, errCode string, err error) {
var storeIDList []int var storeIDList, vendorIDs []int
if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDList); err == nil { if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDList, params.VendorIDs, &vendorIDs); err == nil {
retVal, err = report.GetStatisticsReportForOrders(params.Ctx, storeIDList, params.FromDate, params.ToDate) retVal, err = report.GetStatisticsReportForOrders(params.Ctx, storeIDList, vendorIDs, params.FromDate, params.ToDate)
} }
return retVal, "", err return retVal, "", err
}) })