Merge branch 'bugfixed/pointlimit-reback-dd' into feature/york-1468-bulechafen-new

common/helpers/bonus/BonusCalc.php

@@ -3114,8 +3114,8 @@ class BonusCalc extends BaseObject {
         if( $reConsumePointsTotal < $reConsumePointsCap ) {
             $reConsumePoints = $bonus * $this->_sysConfig['reConsumePointsPercent']['VALUE'] / 100;
 
-            // 2022/05/17 复消积分去掉限制,config reConsumePointsMonthCap上限改成大值如5000000
-            //$reConsumePoints = min($reConsumePoints, $reConsumePointsCap-$reConsumePointsTotal);
+            // 2022/06/07上限改成10000000
+            $reConsumePoints = min($reConsumePoints, $reConsumePointsCap-$reConsumePointsTotal);
         }
         unset($reConsumePointsTotal, $reConsumePointsCap);