|
|
@@ -973,20 +973,15 @@ class BonusCalc extends BaseObject {
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- $realBonusUserId = $bonusUserId ? $bonusUserId : $userId;
|
|
|
- $surplus = $storeBonus;
|
|
|
- $manageTax = $reConsumePoints = '0.000';
|
|
|
- if ($this->_sysConfig['openStoreDeduct']['VALUE']) {
|
|
|
- //扣除相应的复消积分和管理费
|
|
|
- $deductData = $this->deduct($realBonusUserId, $storeBonus);
|
|
|
- // 把对碰后的奖金存入缓存中
|
|
|
- CalcCache::bonus($realBonusUserId, $this->_periodNum, 'BONUS_STORE', $storeBonus, $deductData);
|
|
|
- $surplus = $deductData['surplus'];
|
|
|
- $manageTax = $deductData['manageTax'];
|
|
|
- $reConsumePoints = $deductData['reConsumePoints'];
|
|
|
- } else {
|
|
|
- CalcCache::bonus($realBonusUserId, $this->_periodNum, 'BONUS_STORE', $storeBonus);
|
|
|
- }
|
|
|
+ $realBonusUserId = $bonusUserId ? $bonusUserId : $userId;
|
|
|
+ //扣除相应的复消积分和管理费
|
|
|
+ $deductData = $this->deduct($realBonusUserId, $storeBonus);
|
|
|
+ // 把对碰后的奖金存入缓存中
|
|
|
+ CalcCache::bonus($realBonusUserId, $this->_periodNum, 'BONUS_STORE', $storeBonus, $deductData);
|
|
|
+ $surplus = $deductData['surplus'];
|
|
|
+ $manageTax = $deductData['manageTax'];
|
|
|
+ $reConsumePoints = $deductData['reConsumePoints'];
|
|
|
+
|
|
|
//店服务奖流水
|
|
|
$insertBonusData[] = [
|
|
|
'ID' => SnowFake::instance()->generateId(),
|
|
|
@@ -1034,18 +1029,14 @@ class BonusCalc extends BaseObject {
|
|
|
if (!$isActive) continue;
|
|
|
$surplus = $storeBonus;
|
|
|
$manageTax = $reConsumePoints = '0.000';
|
|
|
- $deductData = [];
|
|
|
- if ($this->_sysConfig['openStoreDeduct']['VALUE']) {
|
|
|
- //扣除相应的复消积分和管理费
|
|
|
- $deductData = $this->deduct($userId, $storeBonus);
|
|
|
- // 把对碰后的奖金存入缓存中
|
|
|
- CalcCache::bonus($userId, $this->_periodNum, 'BONUS_STORE', $storeBonus, $deductData);
|
|
|
- $surplus = $deductData['surplus'];
|
|
|
- $manageTax = $deductData['manageTax'];
|
|
|
- $reConsumePoints = $deductData['reConsumePoints'];
|
|
|
- } else {
|
|
|
- CalcCache::bonus($userId, $this->_periodNum, 'BONUS_STORE', $storeBonus);
|
|
|
- }
|
|
|
+ //扣除相应的复消积分和管理费
|
|
|
+ $deductData = $this->deduct($userId, $storeBonus);
|
|
|
+ // 把对碰后的奖金存入缓存中
|
|
|
+ CalcCache::bonus($userId, $this->_periodNum, 'BONUS_STORE', $storeBonus, $deductData);
|
|
|
+ $surplus = $deductData['surplus'];
|
|
|
+ $manageTax = $deductData['manageTax'];
|
|
|
+ $reConsumePoints = $deductData['reConsumePoints'];
|
|
|
+
|
|
|
|
|
|
//店服务奖流水
|
|
|
$insertBonusData[] = [
|