Explorar o código

Merge branch 'develop' into feature/app_dev

* develop:
  增加商品混合支付
abiao %!s(int64=4) %!d(string=hai) anos
pai
achega
41b5abc167
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      go/gopath/src/fohow.com/apps/helpers/benefit_helper.go

+ 1 - 1
go/gopath/src/fohow.com/apps/helpers/benefit_helper.go

@@ -38,7 +38,7 @@ func NewSendInviterBenefit(wxUser *user_model.WxUser, orderId, source string) {
 			//发放群主收益,(微信支付金额-运费)>0,按(微信支付金额-运费)*20%给上级代理返佣金
 			//val := []int64{productOrder.Pv - productOrder.Freight, productOrder.Pv}
 			//计算佣金的业绩=max(pv-max(扣提货券-运费,0),0)
-			award_cash := int64(0)
+			award_cash := productOrder.Pv
 			couponFee := productOrder.CouponPrice - productOrder.Freight
 			if couponFee > 0 {
 				award_cash = productOrder.Pv - couponFee