Merge branch 'master' into dev

app/common/repositories/user/UserRepository.php

@@ -1075,6 +1075,7 @@ class UserRepository extends BaseRepository
                     'commission_type' => $commission_type,
                     'mark' => empty($mark) ?'管理员调整收益':$mark ,
                     'create_time' => date('Y-m-d H:i:s'),
+                    'take_time' => time()
                 ];
                 if($commission_type != 5){
                     $isert_data['balance'] = $user['brokerage_price'];

app/controller/api/Notify.php

@@ -506,7 +506,7 @@ class Notify
 
 
                                         //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $gx_jf,'score'=> $gx_jf,'brokerage_price'=> $yj_amount,'fugou'=>$fgj_amount]);
-                                        $this->con_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],0,"推广会员专区商品赠送贡献值",1);
+                                        $this->con_log($spread_data['uid'],round($gx_jf * 0.3,2),$store_order_data['order_id'],0,"推广会员专区商品赠送贡献值",1);
                                         $this->score_log($spread_data['uid'],bcmul($gx_jf, $rate, 2),$store_order_data['order_id'],0,"推广会员专区商品赠送积分",1);
                                         //推广佣金
                                         $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金',$store_order_data['mer_id']);