|
|
@@ -188,6 +188,7 @@ class SettleService extends BaseService
|
|
|
$levelData = isset($levelList[$pLevel]) ? $levelList[$pLevel] : 0;
|
|
|
$levelWeightCount = isset($levelWeightCountData['count']) ? $levelWeightCountData['count'] : 0;
|
|
|
$levelBonus = isset($levelData['bonus']) ? $levelData['bonus'] : 0;
|
|
|
+ $levelCount = isset($levelData['upper_count']) ? $levelData['upper_count'] : 0;
|
|
|
$levelName = isset($levelData['name']) ? $levelData['name'] : '';
|
|
|
$data["bonus_{$layer}_uid"] = $pid;
|
|
|
|
|
|
@@ -197,6 +198,7 @@ class SettleService extends BaseService
|
|
|
'mobile' => isset($point['mobile']) ? $point['mobile'] : '',
|
|
|
'jd_bonus' => 0,
|
|
|
'level' => $pLevel,
|
|
|
+ 'upper_count' => $levelCount,
|
|
|
'meal_type' => $mealType,
|
|
|
'level_name' => $levelName,
|
|
|
'weight' => $levelWeightCount,
|
|
|
@@ -354,7 +356,7 @@ class SettleService extends BaseService
|
|
|
];
|
|
|
if (!MemberModel::where(['id' => $directUserId])->update($updateData)) {
|
|
|
RedisService::clear("{$cacheKey}lock");
|
|
|
- $this->error = '直推奖励结算错误';
|
|
|
+ $this->error = '创客奖励结算错误';
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
@@ -369,8 +371,8 @@ class SettleService extends BaseService
|
|
|
'after_money' => moneyFormat($directUserBalance + $directBonus, 2),
|
|
|
'date' => date('Y-m-d'),
|
|
|
'create_time' => time(),
|
|
|
- 'remark' => '直推奖',
|
|
|
- 'remark1' => "用户[ID:{$orderUserId}-{$mobile}]购买礼包直推奖励",
|
|
|
+ 'remark' => '创客',
|
|
|
+ 'remark1' => "用户[ID:{$orderUserId}-{$mobile}]购买礼包直推奖励（创客奖励）",
|
|
|
'status' => 1,
|
|
|
'mark' => 1
|
|
|
];
|
|
|
@@ -398,6 +400,8 @@ class SettleService extends BaseService
|
|
|
$bonusData = isset($commission["bonus_{$i}_data"]) ? $commission["bonus_{$i}_data"] : '';
|
|
|
$bonusData = $bonusData ? json_decode($bonusData, true) : [];
|
|
|
$jdBonus = isset($bonusData['jd_bonus']) ? $bonusData['jd_bonus'] : 0;
|
|
|
+ $level = isset($bonusData['level']) ? $bonusData['level'] : 0;
|
|
|
+ $upperCount = isset($bonusData['upper_count']) ? $bonusData['upper_count'] : 0;
|
|
|
$levelName = isset($bonusData['level_name']) ? $bonusData['level_name'] : '';
|
|
|
$levelBonus = isset($bonusData['level_bonus']) ? $bonusData['level_bonus'] : 0;
|
|
|
$bonusUser = isset($bonusUsers[$uid]) ? $bonusUsers[$uid] : [];
|
|
|
@@ -409,8 +413,9 @@ class SettleService extends BaseService
|
|
|
'bonus_total' => DB::raw("bonus_total + {$bonusTotal}"),
|
|
|
'update_time' => time()
|
|
|
];
|
|
|
+
|
|
|
if (!MemberModel::where(['id' => $uid])->update($updateData)) {
|
|
|
- $this->error = '见单和分红奖励结算错误';
|
|
|
+ $this->error = '创业津贴和分红奖励结算错误';
|
|
|
RedisService::clear("{$cacheKey}lock");
|
|
|
return false;
|
|
|
}
|
|
|
@@ -428,8 +433,8 @@ class SettleService extends BaseService
|
|
|
'after_money' => $bonusUserBalance,
|
|
|
'date' => date('Y-m-d'),
|
|
|
'create_time' => time() + $i,
|
|
|
- 'remark' => '见单奖',
|
|
|
- 'remark1' => "下{$i}级用户[ID:{$orderUserId}-{$mobile}]购买礼包见单奖",
|
|
|
+ 'remark' => '创业津贴',
|
|
|
+ 'remark1' => "下{$i}级用户[ID:{$orderUserId}-{$mobile}]购买礼包见单奖（创业津贴）",
|
|
|
'status' => 1,
|
|
|
'mark' => 1
|
|
|
];
|
|
|
@@ -450,7 +455,7 @@ class SettleService extends BaseService
|
|
|
'after_money' => $bonusUserBalance,
|
|
|
'date' => date('Y-m-d'),
|
|
|
'create_time' => time() + $i,
|
|
|
- 'remark' => '分红收益',
|
|
|
+ 'remark' => "{$levelName}（满{$upperCount}名）",
|
|
|
'remark1' => "下{$i}级用户[ID:{$orderUserId}-{$mobile}]购买礼包等级[{$levelName}]分红收益",
|
|
|
'status' => 1,
|
|
|
'mark' => 1
|
|
|
@@ -493,7 +498,7 @@ class SettleService extends BaseService
|
|
|
'after_money' => $storeBalance,
|
|
|
'date' => date('Y-m-d'),
|
|
|
'create_time' => time(),
|
|
|
- 'remark' => '商家提成结算',
|
|
|
+ 'remark' => '商家收益结算',
|
|
|
'remark1' => "用户[ID:{$orderUserId}-{$mobile}]购买商品提成结算",
|
|
|
'status' => 1,
|
|
|
'mark' => 1
|
