|
|
@@ -512,6 +512,58 @@ func (self *OrderController) Detail() {
|
|
|
self.ServeJSON()
|
|
|
}
|
|
|
|
|
|
+//获取用户待评价订单列表
|
|
|
+func (self *OrderController) WaitCommendList() {
|
|
|
+
|
|
|
+ status := self.GetString("status")
|
|
|
+ page, _ := self.GetInt("page")
|
|
|
+ perPage, _ := self.GetInt("per_page")
|
|
|
+ if page <= 0 {
|
|
|
+ page = 1
|
|
|
+ }
|
|
|
+ if perPage <= 0 || perPage > 100 {
|
|
|
+ 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 {
|
|
|
+ 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 commend {
|
|
|
+ item.ProductList = append(item.ProductList, orderDtItem)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ latestOrders = append(latestOrders, item)
|
|
|
+ }
|
|
|
+ type Ret struct {
|
|
|
+ List []*order_model.Order `json:"list"`
|
|
|
+ ListCount int64 `json:"list_count"`
|
|
|
+ }
|
|
|
+ self.Data["json"] = &Ret{ListCount: count, List: latestOrders}
|
|
|
+ self.ServeJSON()
|
|
|
+}
|
|
|
+
|
|
|
//获取用户订单列表
|
|
|
func (self *OrderController) List() {
|
|
|
|