abiao 3 rokov pred
rodič
commit
f91438f59a

+ 2 - 8
go/gopath/src/fohow.com/apps/models/order_model/order.go

@@ -766,7 +766,6 @@ func GetDistrictOrders(tcBl, page, perPage int64, tcArea string) (orders []*Orde
 	if tcBl > 0 {
 		excuteSql = beginSql + fmt.Sprintf("CAST(dis_amount*%d/100  as decimal(38, 2)) as dis_amount from orders where dis_amount>0 and  ", tcBl)
 	}
-	tcArea = "广州市,中山市"
 	areaArr := helper.NewStr(tcArea).Explode(",")
 	beego.BeeLogger.Warn("areaArr=%v", areaArr)
 	for key, ar := range areaArr {
@@ -793,9 +792,7 @@ func GetDistrictOrders(tcBl, page, perPage int64, tcArea string) (orders []*Orde
 	endTime := endDay.Unix()
 	excuteSql = excuteSql + fmt.Sprintf(" and  paied_at > %d and paied_at < %d", beginTime, endTime)
 
-	beego.BeeLogger.Warn("excuteSql sql=%s", excuteSql)
-
-	endSql := excuteSql + fmt.Sprintf("status in ('processing','complete','dispatch') order by paied_at desc limit %d, %d", (page-1)*perPage, perPage)
+	endSql := excuteSql + fmt.Sprintf(" and status in ('processing','complete','dispatch') order by paied_at desc limit %d, %d", (page-1)*perPage, perPage)
 
 	_, err := orm.NewOrm().Raw(endSql).QueryRows(&orders)
 
@@ -837,16 +834,13 @@ func GetDistrictOrdersCount(tcBl int64, tcArea string) int64 {
 	fmt.Println(endDay.Unix())
 	endTime := endDay.Unix()
 
-	excuteSql = excuteSql + fmt.Sprintf(" and  paied_at > %d and paied_at < %d", beginTime, endTime)
-
-	sql := excuteSql + " status in ('%s','%s','%s') order by paied_at desc limit %d, %d ;"
+	sql := excuteSql + fmt.Sprintf(" and  paied_at > %d and paied_at < %d and  status in ('processing','complete','dispatch') order by paied_at desc", beginTime, endTime)
 
 	type Ret struct {
 		Count int64 `json:"count"`
 	}
 
 	var ret Ret
-	sql = fmt.Sprintf(sql)
 	err := orm.NewOrm().Raw(sql).QueryRow(&ret)
 
 	if err != nil {