Merge branch 'develop' into feature/app_dev

* develop:
  增加商品混合支付

go/gopath/src/fohow.com/apps/helpers/benefit_helper.go

@@ -6,7 +6,6 @@ import (
 	"fohow.com/apps/models/order_model"
 	"fohow.com/apps/models/sys_config"
 	"fohow.com/apps/models/user_model"
-	"fohow.com/libs/tool"
 	"math"
 )
 
@@ -36,11 +35,13 @@ func NewSendInviterBenefit(wxUser *user_model.WxUser, orderId, source string) {
 		}
 
 		if benefitWxUser != nil {
-
 			//发放群主收益，（微信支付金额-运费）>0，按（微信支付金额-运费）*20%给上级代理返佣金
-			val := []int64{productOrder.PaiedPrice - productOrder.Freight, productOrder.Pv}
-			award_cash := tool.Min(val...)
-
+			//val := []int64{productOrder.Pv - productOrder.Freight, productOrder.Pv}
+			//award_cash := tool.Min(val...)
+			award_cash := productOrder.Pv - productOrder.CouponPrice
+			if award_cash <= 0 {
+				return
+			}
 			be_total := float64(award_cash) * (float64(sys_config.GetCashAward()) / float64(100))
 			count := int64(math.Floor(be_total + 0.5))
 			//beego.BeeLogger.Warn("count %d", count)