|
@@ -125,9 +125,10 @@ func (self *OrderController) Create() {
|
|
|
}
|
|
}
|
|
|
order.Pv = product.Pv * count
|
|
order.Pv = product.Pv * count
|
|
|
specialPromotion, specialstr := sys_config.GetSpetialPromotion()
|
|
specialPromotion, specialstr := sys_config.GetSpetialPromotion()
|
|
|
- if specialPromotion{
|
|
|
|
|
|
|
+ if specialPromotion {
|
|
|
order.Promotions = specialstr
|
|
order.Promotions = specialstr
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
order.Save()
|
|
order.Save()
|
|
|
//创建订单明细
|
|
//创建订单明细
|
|
|
new(order_model.OrderDetail).Create(order.OrderId, order.Id, product.Id, product.RelateProductId, product.Price, product.RoboBalancePrice, product.Name,
|
|
new(order_model.OrderDetail).Create(order.OrderId, order.Id, product.Id, product.RelateProductId, product.Price, product.RoboBalancePrice, product.Name,
|
|
@@ -263,7 +264,7 @@ func (self *OrderController) MultipleCreate() {
|
|
|
order.TotalPrice = totalPrice
|
|
order.TotalPrice = totalPrice
|
|
|
order.Freight = freight
|
|
order.Freight = freight
|
|
|
specialPromotion, specialstr := sys_config.GetSpetialPromotion()
|
|
specialPromotion, specialstr := sys_config.GetSpetialPromotion()
|
|
|
- if specialPromotion{
|
|
|
|
|
|
|
+ if specialPromotion {
|
|
|
order.Promotions = specialstr
|
|
order.Promotions = specialstr
|
|
|
}
|
|
}
|
|
|
order.Save()
|
|
order.Save()
|
|
@@ -528,6 +529,7 @@ func (self *OrderController) Detail() {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
o.StatusCn = order_model.STATUS_CN_TEXT[o.Status]
|
|
o.StatusCn = order_model.STATUS_CN_TEXT[o.Status]
|
|
|
|
|
+ o.ShutWechat = sys_config.GetShutWechatPromotion()
|
|
|
o.CTime = o.CreatedAt.Unix()
|
|
o.CTime = o.CreatedAt.Unix()
|
|
|
o.DTime = o.DispatchTime.Unix()
|
|
o.DTime = o.DispatchTime.Unix()
|
|
|
if o.DTime < 0 {
|
|
if o.DTime < 0 {
|