diff --git a/business/model/dao/report.go b/business/model/dao/report.go index 8e253a4f9..5d0e9ecfa 100644 --- a/business/model/dao/report.go +++ b/business/model/dao/report.go @@ -9,21 +9,21 @@ import ( ) type StatisticsReportForOrdersList struct { - StoreID int - orderCounts int - salePrice int64 - actualPayPrice int64 - shopPrice int64 - discountMoney int64 - desiredFee int64 - distanceFreightMoney int64 - waybillTipMoney int64 - totalShopMoney int64 - pmSubsidyMoney int64 - EarningPrice int64 - totalGrossProfit int64 - comGrossProfit float32 - cityManagerGrossProfit float32 + storeID int `json:"storeID"` + orderCounts int `json:"orderCounts"` + salePrice int64 `json:"salePrice"` + actualPayPrice int64 `json:"actualPayPrice"` + shopPrice int64 `json:"shopPrice"` + discountMoney int64 `json:"discountMoney"` + desiredFee int64 `json:"desiredFee"` + distanceFreightMoney int64 `json:"distanceFreightMoney"` + waybillTipMoney int64 `json:"waybillTipMoney"` + totalShopMoney int64 `json:"totalShopMoney"` + pmSubsidyMoney int64 `json:"pmSubsidyMoney"` + earningPrice int64 `json:"earningPrice"` + totalGrossProfit int64 `json:"totalGrossProfit"` + comGrossProfit float32 `json:"comGrossProfit"` + cityManagerGrossProfit float32 `json:"cityManagerGrossProfit"` } func GetStatisticsReportForOrders(db *DaoDB, storeIDs []int, fromDate string, toDate string) (statisticsReportForOrdersList []*StatisticsReportForOrdersList, err error) { diff --git a/controllers/jx_report.go b/controllers/jx_report.go index 6ed9d9ef7..4bad3821e 100644 --- a/controllers/jx_report.go +++ b/controllers/jx_report.go @@ -15,8 +15,8 @@ type ReportController struct { // @Description 根据门店idlist和时间范围查询 // @Param token header string true "认证token" // @Param storeIDs formData string true "京西门店ID列表[1,2,3]" -// @Param FromDate formData string false "开始日期(包含),格式(2006-01-02 00:00:00)" -// @Param ToDate formData string false "结束日期(包含),格式(2006-01-02 00:00:00)" +// @Param fromDate formData string false "开始日期(包含),格式(2006-01-02 00:00:00)" +// @Param toDate formData string false "结束日期(包含),格式(2006-01-02 00:00:00)" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /StatisticsReportForOrders [post]