diff --git a/app/portal/controller/IndexController.php b/app/portal/controller/IndexController.php index 755f5b2..f06ff53 100644 --- a/app/portal/controller/IndexController.php +++ b/app/portal/controller/IndexController.php @@ -70,6 +70,7 @@ class IndexController extends WeChatBaseController } }else{ $data_id = $this -> request -> param(); + dump($data_id);die; //判断跳转链接是否存在数据 if(!empty($data_id)){ //判断用户是不是老师 diff --git a/app/portal/controller/PayController.php b/app/portal/controller/PayController.php index b32640c..974629b 100644 --- a/app/portal/controller/PayController.php +++ b/app/portal/controller/PayController.php @@ -223,12 +223,19 @@ class PayController extends HomeBaseController } //增加老师余额 Db::name('my_user') -> where('uid',$teacher['uid']) -> setInc('balance',$money); - //计算业务员这条订单的收入 - $balance_salesman = $order['money'] - $order['money']*$money_ratio['platform_ratio'] - $money; + //平台抽成收益加入数据库 $as_income_money['money'] = $order['money']*$money_ratio['platform_ratio']; $as_income_money['time'] = time(); Db::name('income_money') -> insert($as_income_money); + //计算业务员这条订单的收入 + if($order['is_courier'] == 2){ + //如果是快递订单给业务员添加快递费 + $balance_salesman = $order['money'] - $order['money']*$money_ratio['platform_ratio'] - $money + $money_ratio['courier']; + }else{ + //如果不是业务员订单则不用添加快递费 + $balance_salesman = $order['money'] - $order['money']*$money_ratio['platform_ratio'] - $money; + } //增加业务员的余额 Db::name('my_user') -> where('uid',$order['salesman_uid']) -> setInc('balance',$balance_salesman); //添加业务员的收入记录 @@ -259,12 +266,19 @@ class PayController extends HomeBaseController } //增加老师余额 Db::name('my_user') -> where('uid',$teacher) -> setInc('balance',$money); - //计算业务员这条订单的收入 - $balance_salesman = $order['money'] - $order['money']*$money_ratio['platform_ratio'] - $money; + //平台抽成收益加入数据库 $ass_income_money['money'] = $order['money']*$money_ratio['platform_ratio']; $ass_income_money['time'] = time(); Db::name('income_money') -> insert($ass_income_money); + //判断是不是快递配送 + if($order['is_courier'] == 2){ + //计算业务员这条订单的收入 + $balance_salesman = $order['money'] - $order['money']*$money_ratio['platform_ratio'] - $money + $money_ratio['courier']; + }else{ + //计算业务员这条订单的收入 + $balance_salesman = $order['money'] - $order['money']*$money_ratio['platform_ratio'] - $money; + } //增加业务员的余额 Db::name('my_user') -> where('uid',$order['salesman_uid']) -> setInc('balance',$balance_salesman); cache('aa',$balance_salesman); diff --git a/app/portal/controller/PersonalcenterController.php b/app/portal/controller/PersonalcenterController.php index 3cad25e..07981bf 100644 --- a/app/portal/controller/PersonalcenterController.php +++ b/app/portal/controller/PersonalcenterController.php @@ -622,7 +622,7 @@ class PersonalcenterController extends WeChatBaseController{ if(count($res) != 0){ $where = [ 'a.indent_type' => 2, - 'a.salesman_uid' => $uid + 'a.salesman_uid' => $uid, ]; if($res['school'] != ''){ $where['a.school'] = $res['school']; @@ -667,7 +667,8 @@ class PersonalcenterController extends WeChatBaseController{ } $this -> assign('indent_goods',$indent_goods); - $indent_money = Db::name('money_income') -> where("uid =".$uid) -> select(); +// $indent_money = Db::name('money_income') -> where("uid =".$uid) -> select(); + $indent_money = $indent_goods; } $total_money = 0;