|
|
@@ -966,29 +966,31 @@ class BonusCalc extends BaseObject {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- unset($parent, $parentBonus);
|
|
|
+ unset($parent);
|
|
|
});
|
|
|
}
|
|
|
if (!$isActive && !$bonusUserId) {
|
|
|
continue;
|
|
|
}
|
|
|
+
|
|
|
+ $realBonusUserId = $bonusUserId ? $bonusUserId : $userId;
|
|
|
$surplus = $storeBonus;
|
|
|
$manageTax = $reConsumePoints = '0.000';
|
|
|
if ($this->_sysConfig['openStoreDeduct']['VALUE']) {
|
|
|
//扣除相应的复消积分和管理费
|
|
|
- $deductData = $this->deduct($userId, $storeBonus);
|
|
|
+ $deductData = $this->deduct($realBonusUserId, $storeBonus);
|
|
|
// 把对碰后的奖金存入缓存中
|
|
|
- CalcCache::bonus($userId, $this->_periodNum, 'BONUS_STORE', $storeBonus, $deductData);
|
|
|
+ CalcCache::bonus($realBonusUserId, $this->_periodNum, 'BONUS_STORE', $storeBonus, $deductData);
|
|
|
$surplus = $deductData['surplus'];
|
|
|
$manageTax = $deductData['manageTax'];
|
|
|
$reConsumePoints = $deductData['reConsumePoints'];
|
|
|
} else {
|
|
|
- CalcCache::bonus($userId, $this->_periodNum, 'BONUS_STORE', $storeBonus);
|
|
|
+ CalcCache::bonus($realBonusUserId, $this->_periodNum, 'BONUS_STORE', $storeBonus);
|
|
|
}
|
|
|
//店服务奖流水
|
|
|
$insertBonusData[] = [
|
|
|
'ID' => SnowFake::instance()->generateId(),
|
|
|
- 'USER_ID' => $bonusUserId ? $bonusUserId : $userId,
|
|
|
+ 'USER_ID' => $realBonusUserId,
|
|
|
'FROM_USER_ID' => $bonusUserId ? $userId : '', // 分享店铺的ID.只有紧缩且未活跃,才有此值
|
|
|
'AMOUNT' => $surplus,
|
|
|
'ORI_BONUS' => $storeBonus,
|
root