diff --git a/app/api/controller/InformationController.php b/app/api/controller/InformationController.php index e097175bc..fadace60c 100644 --- a/app/api/controller/InformationController.php +++ b/app/api/controller/InformationController.php @@ -34,14 +34,26 @@ class InformationController extends BaseApiController { $param = Request()->param(); $user=User::where('id',$this->userId)->find(); + if(isset($param['street']) && $param['street']>0){ + $param['street_id']=$param['street']; + }else{ + $param['street_id']=$user['street']; + } + if(isset($param['village'])&& $param['village']>0){ + $param['village_id']=$param['village']; + }else{ + $param['village_id']=$user['village']; + } + if(isset($param['brigade']) && $param['brigade']>0){ + $param['brigade_id']=$param['brigade']; + }else{ + $param['brigade_id']=$user['brigade']; + } $param['admin_id'] = $this->userId; $param['company_id']=$this->userInfo['company_id']; $param['province_id']=$user['province']; $param['city_id']=$user['city']; $param['area_id']=$user['area']; - $param['street_id']=$user['street']; - $param['village_id']=$user['village']; - $param['brigade_id']=$user['brigade']; $res = UserInformationg::add($param); if ($res != true) { return $this->fail( BaseLogic::getError()); diff --git a/app/common/enum/user/AccountLogEnum.php b/app/common/enum/user/AccountLogEnum.php index 1497dd759..5f9e80d62 100755 --- a/app/common/enum/user/AccountLogEnum.php +++ b/app/common/enum/user/AccountLogEnum.php @@ -54,6 +54,7 @@ class AccountLogEnum const UM_INC_ADMIN = 200; const UM_INC_RECHARGE = 201; const UM_INC_TASK = 202; + const UM_INC_TASKUSER = 203; /** @@ -109,7 +110,8 @@ class AccountLogEnum self::UM_DEC_ADMIN => '平台减少余额', self::UM_INC_ADMIN => '平台增加余额', self::UM_INC_RECHARGE => '充值增加余额', - self::UM_INC_TASK => '任务增加余额', + self::UM_INC_TASK => '任务收益金额增加', + self::UM_INC_TASKUSER => '任务账户余额增加', self::UM_DEC_RECHARGE_REFUND => '充值订单退款减少余额', ]; if ($flag) { diff --git a/app/common/logic/finance/ShareProfit.php b/app/common/logic/finance/ShareProfit.php index b4a0f60cc..870c7c70b 100644 --- a/app/common/logic/finance/ShareProfit.php +++ b/app/common/logic/finance/ShareProfit.php @@ -13,33 +13,35 @@ class ShareProfit $company=Company::where('id',$data['company_id'])->field('id,deposit,company_money')->find(); $master_maoney=bcdiv($data['money'],2,2); - $this->master($data,$master_maoney,$data['user_id']); + $master_maoney_user=bcdiv($master_maoney,2,2); + $arr=[$$data['user_id'], AccountLogEnum::UM_INC_TASK, AccountLogEnum::INC,$master_maoney_user,$data['sn'],$data['msg'].'获得收益'.$master_maoney_user.'元']; + $this->master($arr); + $arr=[$$data['user_id'], AccountLogEnum::UM_INC_TASKUSER, AccountLogEnum::INC,$master_maoney_user,$data['sn'],$data['msg'].'获得账户余额'.$master_maoney_user.'元']; + $this->master($arr); $userAll=User::where('company_id',$data['company_id'])->where('admin_id',0)->field('id,user_money')->select(); $yser_all_count=count($userAll); $merber_money=bcdiv(bcsub($data['money'],$master_maoney,2),$yser_all_count,2); + $master_maoney_user=bcdiv($master_maoney,2,2); foreach ($userAll as $key => $value) { - $this->member($data,$merber_money,$value['id']); + $arr=[$$data['user_id'], AccountLogEnum::UM_INC_TASK, AccountLogEnum::INC,$master_maoney_user,$data['sn'],$data['msg'].'获得收益'.$master_maoney_user.'元']; + $this->member($arr); + $arr=[$$data['user_id'], AccountLogEnum::UM_INC_TASKUSER, AccountLogEnum::INC,$master_maoney_user,$data['sn'],$data['msg'].'获得账户余额'.$master_maoney_user.'元']; + $this->member($arr); } } /**负责人的分润 * @param $data */ - private function master($data,$money,$user_id): void{ - $master=User::where('id',$user_id)->field('id,user_money')->find(); - AccountLogLogic::add($user_id, AccountLogEnum::UM_INC_TASK, AccountLogEnum::INC,$money, - $data['sn'], - $data['msg']); + private function master($data): void{ + AccountLogLogic::add($data[0],$data[1],$data[2],$data[3],$data[4]); } /**成员分润 * @param $data */ - private function member($data,$money,$user_id): void{ - $master=User::where('id',$user_id)->field('id,user_money')->find(); - AccountLogLogic::add($user_id, AccountLogEnum::UM_INC_TASK, AccountLogEnum::INC,$money, - $data['sn'], - $data['msg']); + private function member($data): void{ + AccountLogLogic::add($data[0],$data[1],$data[2],$data[3],$data[4]); } } \ No newline at end of file