companyProjecet.git

			@@ -4,7 +4,8 @@

			use app\common\model\BaseModel;
			use app\common\enum\order\OrderTypeEnum;
			use app\common\model\plus\bonus\User as UserModel;
			use app\common\model\plus\bonus\User as BonusUserModel;
			use app\common\model\user\User as UserModel;
			/**
			* 队长订单模型
			*/
			@@ -190,7 +191,7 @@

			public static function getUserOrderCount($user_id)
			{
			return (new static())->where('second_user_id', '=', $user_id)
			return (new static())->where(['second_user_id'=>$user_id,'is_invalid'=>0])
			->count();
			}

			@@ -208,7 +209,7 @@
			return false;
			}
			// 获取当前买家的直推奖用户id和业绩奖用户id
			$agentUser = $model->getAgentUserId($order, $setting['begin_num']);
			$agentUser = $model->getAgentUserId($order, $setting['begin_num'], $setting);
			// 无分红用户
			if (!$agentUser['first_user_id'] && !$agentUser['second_user_id']) {
			return false;
			@@ -236,7 +237,7 @@
			'order_id' => $order['order_id'],
			'order_type' => $order_type,
			'order_price' => bcsub($order['pay_price'], $order['express_price'], 2),
			'first_money' => $agentUser['first_user_id'] > 0 ? $one_money : 0,
			'first_money' => $one_money,
			'second_money' => $two_money,
			'first_user_id' => $one_money > 0 ?$agentUser['first_user_id']:0,
			'second_user_id' => $agentUser['second_user_id'],
			@@ -251,21 +252,26 @@
			/**
			* 获取当前买家的所有上级分销商用户id
			*/
			private function getAgentUserId($order, $begin_num)
			private function getAgentUserId($order, $begin_num, $setting)
			{
			$user = UserModel::detail($order['user_id']);
			$user = BonusUserModel::detail($order['user_id']);
			if (empty($user['parent_id'])) {
			$second_user_id = 0;
			} else {
			$second_user_id = UserModel::getSecondUserId($user['user_id'], $begin_num, $order);
			$second_user_id = BonusUserModel::getSecondUserId($user['user_id'], $begin_num, $order);
			}
			if ($second_user_id==0){
			$subsidy_user_id = 0;
			}else{
			$subsidy_user_id = UserModel::getSubsidyUserId($second_user_id); //补贴用户
			$subsidy_user_id = BonusUserModel::getSubsidyUserId($second_user_id); //补贴用户
			if ($subsidy_user_id!=0){
			if (!UserModel::getOperatingSubsidy($subsidy_user_id,$setting)){
			$subsidy_user_id = 0;
			}
			}
			}
			$agentUser = [
			'first_user_id' => UserModel::getFirstUserId($order['user_id']), //直推用户
			'first_user_id' => BonusUserModel::getFirstUserId($order['user_id']), //直推用户
			'second_user_id' => $second_user_id, //业绩奖用户
			'subsidy_user_id'=>$subsidy_user_id, //补贴用户
			];