|
|
@@ -467,6 +467,7 @@ func (self *OrderController) Detail() {
|
|
|
if item.Commend || o.Status != order_model.STATUS_COMPLETE {
|
|
|
item.Commend = true
|
|
|
}
|
|
|
+ item.Package = product.Package
|
|
|
if product.Package {
|
|
|
item.PacakageList = order_model.GetOrderDetailPackages(product.Id, true)
|
|
|
}
|
|
|
@@ -515,12 +516,14 @@ func (self *OrderController) List() {
|
|
|
count := order_model.GetUserOrdersCount(wxUId, status)
|
|
|
|
|
|
for _, item := range orders {
|
|
|
+
|
|
|
orderList := order_model.GetAllDetailsOrderId(item.OrderId, false)
|
|
|
for _, orderItem := range orderList {
|
|
|
product := product_model.GetProductById(orderItem.ProductId, cache)
|
|
|
if product == nil {
|
|
|
continue
|
|
|
}
|
|
|
+ orderItem.Package = product.Package
|
|
|
item.Count += orderItem.Count
|
|
|
if orderItem.Commend || item.Status != order_model.STATUS_COMPLETE {
|
|
|
orderItem.Commend = true
|