orders list add wait commend

go/gopath/src/fohow.com/apps/controllers/order_controller/order_controller.go

@@ -578,37 +578,77 @@ func (self *OrderController) List() {
 	if perPage <= 0 || perPage > 100 {
 		perPage = 20
 	}
+
+	if status == order_model.WAIT_COMMEN {
+		perPage = 100
+	}
 	cache, _ := self.GetBool("cache", false)
 	//uId := self.GetCurrentUserId()
 	wxUId := self.GetCurrentWxUserId()
 	orders := order_model.GetUserOrders(wxUId, status, page, perPage)
 	count := order_model.GetUserOrdersCount(wxUId, status)
+	var latestOrders []*order_model.Order
 
-	for _, item := range orders {
-
-		orderDtList := order_model.GetAllDetailsOrderId(item.OrderId, false)
-		for _, orderDtItem := range orderDtList {
-			product := product_model.GetProductById(orderDtItem.ProductId, cache)
-			if product == nil {
-				continue
+	if status != order_model.WAIT_COMMEN {
+		for _, item := range orders {
+			orderDtList := order_model.GetAllDetailsOrderId(item.OrderId, false)
+			for _, orderDtItem := range orderDtList {
+				product := product_model.GetProductById(orderDtItem.ProductId, cache)
+				if product == nil {
+					continue
+				}
+				orderDtItem.Package = product.Package
+				item.Count += orderDtItem.Count
+				if orderDtItem.Commend || item.Status != order_model.STATUS_COMPLETE {
+					orderDtItem.Commend = true
+				}
+				if product.Package {
+					orderDtItem.PacakageList = order_model.GetOrderDetailPackages(orderDtItem.Id, item.Count, true)
+				}
+				orderDtItem.Cover = product.Cover
+				item.ProductList = append(item.ProductList, orderDtItem)
 			}
-			orderDtItem.Package = product.Package
-			item.Count += orderDtItem.Count
-			if orderDtItem.Commend || item.Status != order_model.STATUS_COMPLETE {
-				orderDtItem.Commend = true
+			latestOrders = append(latestOrders, item)
+		}
+
+	} else {
+
+		for _, item := range orders {
+			commend := false
+			orderDtList := order_model.GetAllDetailsOrderId(item.OrderId, false)
+			for _, orderDtItem := range orderDtList {
+				product := product_model.GetProductById(orderDtItem.ProductId, cache)
+				if product == nil {
+					continue
+				}
+				orderDtItem.Package = product.Package
+				item.Count += orderDtItem.Count
+				if orderDtItem.Commend || item.Status != order_model.STATUS_COMPLETE {
+					orderDtItem.Commend = true
+				}
+				if !orderDtItem.Commend {
+					commend = true
+				}
+				if product.Package {
+					orderDtItem.PacakageList = order_model.GetOrderDetailPackages(orderDtItem.Id, item.Count, true)
+				}
+				orderDtItem.Cover = product.Cover
+				if !orderDtItem.Commend {
+					item.ProductList = append(item.ProductList, orderDtItem)
+				}
 			}
-			if product.Package {
-				orderDtItem.PacakageList = order_model.GetOrderDetailPackages(orderDtItem.Id, item.Count, true)
+			if commend {
+				latestOrders = append(latestOrders, item)
+			} else {
+				count = count - 1
 			}
-			orderDtItem.Cover = product.Cover
-			item.ProductList = append(item.ProductList, orderDtItem)
 		}
 	}
 	type Ret struct {
 		List      []*order_model.Order `json:"list"`
 		ListCount int64                `json:"list_count"`
 	}
-	self.Data["json"] = &Ret{ListCount: count, List: orders}
+	self.Data["json"] = &Ret{ListCount: count, List: latestOrders}
 	self.ServeJSON()
 }
 

go/gopath/src/fohow.com/apps/models/order_model/order.go

@@ -27,6 +27,7 @@ const (
 	STATUS_COMPLETE    = "complete"    //"已完成"
 	STATUS_DISPATCH    = "dispatch"    // '待收货',
 	STATUS_REFUNDED    = "refunded"    // '已退款',
+	WAIT_COMMEN        = "waitcommen"  //"待评价"
 
 	ORDER_ID_PREFIX_EX = "EX" //兑换订单