Merge branch 'develop' into feature/app_dev

* develop:
  增加商品混合支付

go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_exchange_controller.go

@@ -96,7 +96,6 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 	}
 
 	//获取购物商品明细
-	buy_price_total := int64(0)
 	total_price := int64(0)
 	total_quan := int64(0)
 	total_weixin := int64(0)
@@ -141,7 +140,6 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 		if product.Pv >= product.Price {
 			total_quan += product.Price * item.Count
 		}
-		buy_price_total += product.BuyPrice * item.Count
 		total_price += product.Price * item.Count
 		SaleNumsMap[product.Id] = item.Count
 		storeMap[product.Id] = item.Count
@@ -162,7 +160,6 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 		order.Contact = concat
 		order.Tel = tel
 		order.Address = addr
-		order.BuyPrice = buy_price_total
 		order.TotalPrice = total_price
 		//支付信息判断
 		//黑名单用户
@@ -384,7 +381,6 @@ func (self *PayController) payCentExchange(oId, returnUrl, source, remark string
 	}
 	SaleNumsMap := make(map[int64]int64)
 	//获取购物商品明细
-	buy_price_total := int64(0)
 	total_price := int64(0)
 	list := order_model.GetAllDetailsOrderId(order.OrderId, false)
 	for _, item := range list {
@@ -414,7 +410,6 @@ func (self *PayController) payCentExchange(oId, returnUrl, source, remark string
 				}
 			}
 		}
-		buy_price_total += product.BuyPrice * item.Count
 		total_price += product.Price * item.Count
 		SaleNumsMap[product.Id] = item.Count
 	}
@@ -428,7 +423,6 @@ func (self *PayController) payCentExchange(oId, returnUrl, source, remark string
 	order.Contact = address.Contact
 	order.Tel = address.Tel
 	order.Address = fmt.Sprintf("%s%s%s%s", address.Province, address.City, address.District, address.Address)
-	order.BuyPrice = buy_price_total
 	order.TotalPrice = total_price
 	//支付信息判断
 	//黑名单用户