diff --git a/app/api/logic/BillionsLogic.php b/app/api/logic/BillionsLogic.php index 5dbd2b2a..d35a809d 100755 --- a/app/api/logic/BillionsLogic.php +++ b/app/api/logic/BillionsLogic.php @@ -471,9 +471,9 @@ class BillionsLogic extends Logic // $data['goods_num'] = 1; // 充值接口设置为1 // $data['order_id'] = $id; // $data['dtime'] = date("Y-m-d H:i:s"); -// $data['type'] = 3; // 类型是充值 +// $data['type'] = 3; // 类型是返充 // $data['subsidy_price'] = round($money * $user_subsidy / 100,8); -// $res = Db::name("user_billions")->save($data); +// $res = Db::name("user_billions")->insertGetId($data); $subsidy = $money * $all_user_subsidy / 100; if($is_d != null){ $ufl = round($subsidy*$user_first_leader/100,8); @@ -567,6 +567,24 @@ class BillionsLogic extends Logic $order['id'] = $post['id']; $paynot->atcl($order,$store_subsidy,$type,$user,$first_leader,$other_leader); } + $billions_count = Db::name("user_billions")->where("state",0)->count(); + $data_surplus['billions_id'] = $id; + $data_surplus['subsidy_all_price'] = $subsidy; + $data_surplus['user_start_num'] = $user_start_num; + $data_surplus['user_start_subsidy'] = $user_start_subsidy; + $data_surplus['user_start_price'] = round($subsidy*$user_start_subsidy/100,8); + $data_surplus['user_start_avg_price'] = round($data_surplus['user_start_price']/$user_start_num,8); + $data_surplus['residue_price'] = $subsidy-$data_surplus['user_start_price']; + if($billions_count>$user_start_num){ + $data_surplus['user_price'] = round(($subsidy-$data_surplus['user_start_price'])/($billions_count-$user_start_num),8); + } + $data_surplus['dtime'] = date("Y-m-d H:i:s"); + $rest = Db::name("user_billions_surplus")->save($data_surplus); + return $rest; + die; + + + // $first_msg = Db::name("user_billions")->where("user_id",$user['first_leader'])->where("state",0)->select()->toArray(); $billions_msg = Db::name("user_billions")->where("state",0)->select()->toArray(); $count = count($billions_msg); diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 41abb58a..947de087 100755 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -999,7 +999,7 @@ class PayNotifyLogic $source_type = $source_type1 =$source_type2= 0; if($type == "balance_rechange"){ $remark = "用户充值佣金"; - $source_type = AccountLog::recharge_billions_inc_earnings; + $source_type = AccountLog::recharge_inc_earnings; $remark1 = "无极充值佣金"; $source_type1 = AccountLog::electrodeless_rechange_inc_earnings; $remark2 = "无极公司充值佣金"; diff --git a/app/common/model/AccountLog.php b/app/common/model/AccountLog.php index 127eae65..40a9bcb3 100755 --- a/app/common/model/AccountLog.php +++ b/app/common/model/AccountLog.php @@ -54,7 +54,7 @@ class AccountLog extends Models const admin_reduce_earnings = 404; //后台减少佣金 const shop_reduce_wallet = 405; //商户钱包金额减少 const billions_inc_earnings = 406;//百亿返补佣金增加 - const recharge_billions_inc_earnings = 407;//充值百亿返补佣金增加 + const recharge_inc_earnings = 407;//充值百亿返补佣金增加 const recharge_billions_inc_balance = 408;//充值百亿返补本地余额增加 const local_inc_earnings = 409;//推广本地商家收款佣金增加 const balance_rechange_inc_earnings = 410;//推广用户充值佣金增加 @@ -92,7 +92,7 @@ class AccountLog extends Models self::shop_reduce_wallet, //商户佣金减少 self::baiyibutie, //百亿补贴 self::billions_inc_earnings,//百亿返贴 - self::recharge_billions_inc_earnings,//返充值 + self::recharge_inc_earnings,//返充值 self::local_inc_earnings,//本地商家支付佣金增加 self::balance_rechange_inc_earnings,//推广用户充值佣金增加 self::electrodeless_rechange_inc_earnings,//无极会员推广充值佣金增加 @@ -134,7 +134,7 @@ class AccountLog extends Models self::local_user_inc_earnings => '本地生活用户佣金', self::electrodeless_local_inc_earnings => '无极本地生活用户佣金', self::company_electrodeless_local_inc_earnings => '无极公司本地生活用户佣金', - self::recharge_billions_inc_earnings => '用户返充佣金', + self::recharge_inc_earnings => '用户充值佣金', self::billions_rechange_inc_earnings => '返补充值佣金', self::electrodeless_billions_rechange_inc_earnings => '无极返补充值佣金', self::company_electrodeless_billions_rechange_inc_earnings => '无极公司返补充值佣金',