abiao преди 3 години
родител
ревизия
26df4add9c
променени са 1 файла, в които са добавени 22 реда и са изтрити 22 реда
  1. 22 22
      go/gopath/src/fohow.com/apps/models/order_model/order.go

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

@@ -767,21 +767,21 @@ func GetDistrictOrders(tcBl, page, perPage int64, tcArea string) (orders []*Orde
 		excuteSql = beginSql + fmt.Sprintf(" floor(dis_amount*%d/100) as dis_amount  from orders where dis_amount>0 and  ", tcBl)
 	}
 	areaArr := helper.NewStr(tcArea).Explode(",")
-	if len(areaArr) > 0 {
-		for key, ar := range areaArr {
-			beego.BeeLogger.Warn("ar ar=%s", ar)
-
-			if key == 0 {
-				areaSql = fmt.Sprintf("( address like %s%s%s", "'%", ar, "%'")
-			} else {
-				areaSql = areaSql + fmt.Sprintf(" or address like %s%s%s", "'%", ar, "%'")
-			}
+	//if len(areaArr) > 0 {
+	for key, ar := range areaArr {
+		beego.BeeLogger.Warn("ar ar=%s", ar)
+
+		if key == 0 {
+			areaSql = fmt.Sprintf("( address like %s%s%s", "'%", ar, "%'")
+		} else {
+			areaSql = areaSql + fmt.Sprintf(" or address like %s%s%s", "'%", ar, "%'")
+		}
 
-			if key == (len(areaArr) - 1) {
-				areaSql = areaSql + " )"
-			}
+		if key == (len(areaArr) - 1) {
+			areaSql = areaSql + " )"
 		}
 	}
+	//}
 
 	excuteSql = excuteSql + areaSql
 
@@ -811,19 +811,19 @@ func GetDistrictOrdersCount(tcBl int64, tcArea string) int64 {
 	var areaSql string
 
 	areaArr := helper.NewStr(tcArea).Explode(",")
-	if len(areaArr) > 0 {
-		for key, ar := range areaArr {
-			if key == 0 {
-				areaSql = fmt.Sprintf("( address like %s", "'%"+ar+"%'")
-			} else {
-				areaSql = areaSql + fmt.Sprintf(" or address like %s", "'%"+ar+"%'")
-			}
+	//if len(areaArr) > 0 {
+	for key, ar := range areaArr {
+		if key == 0 {
+			areaSql = fmt.Sprintf("( address like %s", "'%"+ar+"%'")
+		} else {
+			areaSql = areaSql + fmt.Sprintf(" or address like %s", "'%"+ar+"%'")
+		}
 
-			if key == (len(areaArr) - 1) {
-				areaSql = areaSql + " )"
-			}
+		if key == (len(areaArr) - 1) {
+			areaSql = areaSql + " )"
 		}
 	}
+	//}
 
 	excuteSql = excuteSql + areaSql