Просмотр исходного кода

更改统计时间为日期型

abiao лет назад: 5
Родитель
Сommit
1739f891ce

+ 2 - 2
go/gopath/src/fohow.com/apps/controllers/railsadmin_controller/order_static_controller.go

@@ -21,8 +21,8 @@ func (self *RailsadminController) OrderStatic() {
 	if orderStatic == nil {
 		self.ReturnError(404, apps.NoExist, "", nil)
 	}
-	bDateUninx := orderStatic.BeginDate.Unix() - int64(8*60*60)
-	eDateUninx := orderStatic.EndDate.Unix() - int64(8*60*60)
+	bDateUninx := orderStatic.BeginDate
+	eDateUninx := orderStatic.EndDate
 	state := orderStatic.State
 	IsSend := orderStatic.IsSend
 	orderDetails := order_model.GetStaticOrderDetails(bDateUninx, eDateUninx, state, IsSend)

+ 10 - 7
go/gopath/src/fohow.com/apps/models/order_model/order_detail.go

@@ -108,16 +108,19 @@ func GetAllDetailsOrderId(oId string) (items []*OrderDetail) {
 }
 
 //获取商品销售统计
-func GetStaticOrderDetails(bDateUnix, eDateUnix int64, state string, isSend bool) (details []*OrderDetail) {
-	beego.BeeLogger.Warn("bDateUnix=[%d]", bDateUnix)
-	beego.BeeLogger.Warn("eDateUnix=[%d]", eDateUnix)
+func GetStaticOrderDetails(bDate, eDate time.Time, state string, isSend bool) (details []*OrderDetail) {
+	bDateStr := bDate.Format("2006-01-02 15:04:05") //2015-06-15 08:52:32
+	eDateStr := eDate.Format("2006-01-02 15:04:05") //2015-06-15 08:52:32
+
+	beego.BeeLogger.Warn("bDate=[%s]", bDateStr)
+	beego.BeeLogger.Warn("eDate=[%s]", eDateStr)
 	sql := "select sum(ot.nums) as nums ,price,ot.product_id,ot.product_name  from order_details ot left join orders o on ot.order_id=o.id where "
-	if bDateUnix > 0 {
-		s := fmt.Sprintf(" UNIX_TIMESTAMP(o.created_at)>=%d", bDateUnix)
+	if bDate.Unix() > 0 {
+		s := fmt.Sprintf(" date_add(o.created_at,interval 8 hour)>=%s", bDateStr)
 		sql = strings.Join([]string{sql, s}, " ")
 	}
-	if eDateUnix > 0 {
-		s := fmt.Sprintf(" AND UNIX_TIMESTAMP(o.created_at)<=%d", eDateUnix)
+	if eDate.Unix() > 0 {
+		s := fmt.Sprintf(" AND date_add(o.created_at,,interval 8 hour)<=%s", eDateStr)
 		sql = strings.Join([]string{sql, s}, " ")
 	}
 	if len(state) > 0 {