|
|
@@ -457,8 +457,8 @@ func (self *OrderController) Detail() {
|
|
|
beego.BeeLogger.Error("order not exist id=[%s]", oId)
|
|
|
self.ReturnError(404, apps.OrderNotExist, "", nil)
|
|
|
}
|
|
|
- orderList := order_model.GetAllDetailsOrderId(o.OrderId, false)
|
|
|
- for _, item := range orderList {
|
|
|
+ orderDtList := order_model.GetAllDetailsOrderId(o.OrderId, false)
|
|
|
+ for _, item := range orderDtList {
|
|
|
product := product_model.GetProductById(item.ProductId, cache)
|
|
|
if product == nil {
|
|
|
self.ReturnError(403, apps.ProductNotExist, "", nil)
|
|
|
@@ -469,7 +469,7 @@ func (self *OrderController) Detail() {
|
|
|
}
|
|
|
item.Package = product.Package
|
|
|
if product.Package {
|
|
|
- item.PacakageList = order_model.GetOrderDetailPackages(product.Id, true)
|
|
|
+ item.PacakageList = order_model.GetOrderDetailPackages(item.Id, item.Count, true)
|
|
|
}
|
|
|
o.Count += item.Count
|
|
|
item.Cover = product.Cover
|
|
|
@@ -517,22 +517,22 @@ func (self *OrderController) List() {
|
|
|
|
|
|
for _, item := range orders {
|
|
|
|
|
|
- orderList := order_model.GetAllDetailsOrderId(item.OrderId, false)
|
|
|
- for _, orderItem := range orderList {
|
|
|
- product := product_model.GetProductById(orderItem.ProductId, cache)
|
|
|
+ orderDtList := order_model.GetAllDetailsOrderId(item.OrderId, false)
|
|
|
+ for _, orderDtItem := range orderDtList {
|
|
|
+ product := product_model.GetProductById(orderDtItem.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
|
|
|
+ orderDtItem.Package = product.Package
|
|
|
+ item.Count += orderDtItem.Count
|
|
|
+ if orderDtItem.Commend || item.Status != order_model.STATUS_COMPLETE {
|
|
|
+ orderDtItem.Commend = true
|
|
|
}
|
|
|
if product.Package {
|
|
|
- orderItem.PacakageList = order_model.GetOrderDetailPackages(product.Id, true)
|
|
|
+ orderDtItem.PacakageList = order_model.GetOrderDetailPackages(orderDtItem.Id, item.Count, true)
|
|
|
}
|
|
|
- orderItem.Cover = product.Cover
|
|
|
- item.ProductList = append(item.ProductList, orderItem)
|
|
|
+ orderDtItem.Cover = product.Cover
|
|
|
+ item.ProductList = append(item.ProductList, orderDtItem)
|
|
|
}
|
|
|
}
|
|
|
type Ret struct {
|