|
|
@@ -3298,7 +3298,7 @@ class BonusCalc extends BaseObject {
|
|
|
->one();
|
|
|
// 因为非月节点周期,未发放复消积分.所以,需要结算月满足最低消费的时候,一起发放
|
|
|
$gxPointMonth = CalcBonusGX::findUseSlaves()
|
|
|
- ->select('SUM(RECONSUME_POINTS) AS FLOW_GX_POINT')
|
|
|
+ ->select('SUM(RECONSUME_POINTS) AS FLOW_GX_POINT, SUM(MANAGE_TAX) AS FLOW_MANAGE_TAX')
|
|
|
->where('USER_ID=:USER_ID AND CALC_MONTH=:CALC_MONTH AND PERIOD_NUM!=:PERIOD_NUM',
|
|
|
[
|
|
|
'USER_ID'=>$userId,
|
|
|
@@ -3308,10 +3308,13 @@ class BonusCalc extends BaseObject {
|
|
|
)
|
|
|
->asArray()
|
|
|
->one();
|
|
|
+ // 如果已发放了复消积分,则不能再累加之前的了
|
|
|
$bonusGxSum = $monthSumData['BONUS_GX_SUM'] ?? 0;
|
|
|
$bonusGlSum = $monthSumData['BONUS_GL_SUM'] ?? 0;
|
|
|
$bonusPoint = $gxPointMonth['FLOW_GX_POINT'] ?? 0;
|
|
|
+ $bonusManage = $gxPointMonth['FLOW_MANAGE_TAX'] ?? 0;
|
|
|
$bonus['RECONSUME_POINTS'] = $bonus['RECONSUME_POINTS'] + $bonusPoint;
|
|
|
+ $bonus['MANAGE_TAX'] = $bonus['MANAGE_TAX'] + $bonusManage;
|
|
|
$realBonusGx += $bonusGxSum + $bonus['BONUS_GX'];
|
|
|
$realBonusGl += $bonusGlSum + $bonus['BONUS_GL'];
|
|
|
$realBonusBs = $blueStartAmount; // 蓝星奖直接取数据库中算好的值PRODUCT_POINT
|
root