feature/NG-27: Qualified bonus regulations 奖金合格制度：活动期间购买指定商品，BV≥27即可维持活跃度.

common/models/Period.php

@@ -283,6 +283,16 @@ class Period extends \common\components\ActiveRecord
         return Period::find()->where('CALC_YEAR=:CALC_YEAR AND CALC_MONTH=:CALC_MONTH', [':CALC_YEAR'=>$year, ':CALC_MONTH'=>$month])->count(1);
     }
 
+    /**
+     * 所传年、月所有期数
+     * @param $year
+     * @param $month
+     * @return array
+     */
+    public function getYearMonthAllPeriod($year, $month){
+        return Period::find()->select('PERIOD_NUM')->where('CALC_YEAR=:CALC_YEAR AND CALC_MONTH=:CALC_MONTH', [':CALC_YEAR'=>$year, ':CALC_MONTH'=>$month])->column();
+    }
+
     /**
      * 是否是结算月节点
      * @param $periodNum

common/models/User.php

@@ -492,8 +492,8 @@ class User extends \common\components\ActiveRecord
         $periodObj = Period::instance();
         $calcYear = $periodObj->getYear($periodNum);
         $calcMonth = $periodObj->getMonth($periodNum);
-
-        $calcMonth = $calcYear . (strlen($calcMonth) == 1 ? '0' . $calcMonth : $calcMonth);
+        $periodList = $periodObj->getYearMonthAllPeriod($calcYear, $calcMonth);
+        $periodList = implode("','", $periodList);
 
         // 条件2: 任意水机+150粒的EKSP(HES150N)
 //        $orderEKSP = Order::find()
@@ -506,8 +506,8 @@ class User extends \common\components\ActiveRecord
         $query = Order::find()
             ->alias('O')
             ->join('INNER JOIN', OrderGoods::tableName() . ' AS G', 'O.SN = G.ORDER_SN')
-            ->where("O.IS_DELETE=0 AND O.USER_ID=:USER_ID AND LEFT(O.P_CALC_MONTH, 7)=:P_CALC_MONTH AND O.PERIOD_NUM<=:PERIOD_NUM AND G.SKU_CODE=:SKU_CODE",
-                ['USER_ID' => $userId, 'P_CALC_MONTH' => $calcMonth, 'PERIOD_NUM' => $periodNum, ':SKU_CODE' => 'HES150N']);
+            ->where("O.IS_DELETE=0 AND O.USER_ID=:USER_ID AND O.PERIOD_NUM IN ('{$periodList}') AND G.SKU_CODE=:SKU_CODE",
+                ['USER_ID' => $userId, ':SKU_CODE' => 'HES150N']);
 
         LoggerTool::debug('isPerfActive-1-sql: ' . $userId . ': ' . $query->createCommand()->getRawSql());
         $orderEKSP = $query->count();
@@ -529,8 +529,7 @@ class User extends \common\components\ActiveRecord
         $query1 = Order::find()
             ->alias('O')
             ->join('INNER JOIN', OrderGoods::tableName() . ' AS G', 'O.SN = G.ORDER_SN')
-            ->where("O.IS_DELETE=0 AND O.USER_ID=:USER_ID AND LEFT(O.P_CALC_MONTH, 7)=:P_CALC_MONTH AND O.PERIOD_NUM<=:PERIOD_NUM AND G.SKU_CODE IN ('{$instalmentShopGoods}')",
-                ['USER_ID' => $userId, 'P_CALC_MONTH' => $calcMonth, 'PERIOD_NUM' => $periodNum]);
+            ->where("O.IS_DELETE=0 AND O.USER_ID=:USER_ID AND O.PERIOD_NUM ('{$periodList}') AND G.SKU_CODE IN ('{$instalmentShopGoods}')", ['USER_ID' => $userId]);
 
         LoggerTool::debug('isPerfActive-2-sql: ' . $userId . ': ' . $query1->createCommand()->getRawSql());
         $orderInstalment = $query1->count();