Merge branch 'develop'

This commit is contained in:
monanxiao 2023-03-20 14:57:37 +08:00
commit ab6b6f9352

View File

@ -88,17 +88,19 @@ class SupplyChainOrderBrokerAgeJob implements JobInterface
// 增加小组服务佣金 // 增加小组服务佣金
$userRepository->incSupplyBrokerage($data['uid'], $price); $userRepository->incSupplyBrokerage($data['uid'], $price);
// 后台分组用户开始 // 后台分组用户开始
$userInfo = User::with('nkUserMsg')->find($data['uid']); // 当前用户信息 $userInfo = User::with('nkUserMsg')->find($data['uid']); // 当前用户信息
$nkUserMsg = $userInfo['nkUserMsg']; // 当前用户关联上级街道、区县等信息 $nkUserMsg = $userInfo['nkUserMsg']; // 当前用户关联上级街道、区县等信息
// $brigade_id = $nkUserMsg['brigade_id']; // 大队
$brigade_id = $nkUserMsg['brigade_id']; // 大队
$village_id = $nkUserMsg['village_id']; // 村 $village_id = $nkUserMsg['village_id']; // 村
$street_id = $nkUserMsg['street_id']; //镇 $street_id = $nkUserMsg['street_id']; //镇
$area_id = $nkUserMsg['area_id']; // 区域 $area_id = $nkUserMsg['area_id']; // 区域
$city_code = GeoArea::where('area_code', $area_id)->value('city_code'); // 市 $city_code = GeoArea::where('area_code', $area_id)->value('city_code'); // 市
$supplyChainTeam = SupplyChainTeam::with('level')->whereIn('parent_code', [$village_id, $street_id, $area_id, $city_code])
// 获取供应链团队
$supplyChainTeam = SupplyChainTeam::with('level')
->where('parent_code', 'in', [$brigade_id, $village_id, $street_id, $area_id, $city_code])
->select(); // 获取关联上级团队 ->select(); // 获取关联上级团队
if($supplyChainTeam) if($supplyChainTeam)
@ -111,7 +113,7 @@ class SupplyChainOrderBrokerAgeJob implements JobInterface
// 分润数据 // 分润数据
$dataArr = [ $dataArr = [
'supply_team_id' => $v['id'], // 用户ID 'supply_team_id' => $v['id'], // 团队ID
'pay_price' => $data['inc'], // 订单金额 'pay_price' => $data['inc'], // 订单金额
'price' => $price, // 订单分佣金额 'price' => $price, // 订单分佣金额
'order_sn' => $data['order_sn'], // 订单编号 'order_sn' => $data['order_sn'], // 订单编号
@ -125,7 +127,7 @@ class SupplyChainOrderBrokerAgeJob implements JobInterface
]; ];
SupplyChainBorkerage::create($dataArr); // 储存小组服务分佣记录 SupplyChainBorkerage::create($dataArr); // 储存小组服务分佣记录
SupplyChainTeam::inc('free_brokerage', $usrPrice)->update(); // 增加冻结佣金 SupplyChainTeam::where('id', $v['id'])->inc('free_brokerage', $usrPrice)->update(); // 增加冻结佣金
} }
} }
} }