Просмотр исходного кода

feat: NG-27: Qualified bonus regulations

kevin 1 год назад
Родитель
Сommit
61fa7bb175
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      frontendApi/modules/v1/controllers/SiteController.php

+ 4 - 4
frontendApi/modules/v1/controllers/SiteController.php

@@ -133,8 +133,8 @@ class SiteController extends BaseController
         $orderEKSP = 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 O.CALC_MONTH=:CALC_MONTH AND O.PERIOD_NUM<=:PERIOD_NUM AND G.SKU_CODE=:SKU_CODE",
-                ['USER_ID' => $userId, 'CALC_MONTH' => $_calcYearMonth, 'PERIOD_NUM' => $_periodNum, ':SKU_CODE' => 'BA'])
+            ->where("O.IS_DELETE=0 AND O.USER_ID=:USER_ID AND O.P_CALC_MONTH=:P_CALC_MONTH AND O.PERIOD_NUM<=:PERIOD_NUM AND G.SKU_CODE=:SKU_CODE",
+                ['USER_ID' => $userId, 'P_CALC_MONTH' => $_calcYearMonth, 'PERIOD_NUM' => $_periodNum, ':SKU_CODE' => 'BA'])
             ->count();
         if (!$orderEKSP) {
             return static::notice(['daysDiff'=>Yii::$app->params['daysDiff'], 'rs' => 2]);
@@ -146,8 +146,8 @@ class SiteController extends BaseController
         $orderInstalment = 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 O.CALC_MONTH=:CALC_MONTH AND O.PERIOD_NUM<=:PERIOD_NUM AND G.SKU_CODE IN ('{$instalmentShopGoods}')",
-                ['USER_ID' => $userId, 'CALC_MONTH' => $_calcYearMonth, 'PERIOD_NUM' => $_periodNum])
+            ->where("O.IS_DELETE=0 AND O.USER_ID=:USER_ID AND O.P_CALC_MONTH=:P_CALC_MONTH AND O.PERIOD_NUM<=:PERIOD_NUM AND G.SKU_CODE IN ('{$instalmentShopGoods}')",
+                ['USER_ID' => $userId, 'P_CALC_MONTH' => $_calcYearMonth, 'PERIOD_NUM' => $_periodNum])
             ->count();
         if (!$orderInstalment) {
             return static::notice(['daysDiff'=>Yii::$app->params['daysDiff'], 'rs' => 3]);