yingzi пре 1 година
родитељ
комит
837950b82b
2 измењених фајлова са 4 додато и 0 уклоњено
  1. 1 0
      Controller/Purchase/Purchase.Class.php
  2. 3 0
      Model/Purchase/MPurchase.Class.php

+ 1 - 0
Controller/Purchase/Purchase.Class.php

@@ -504,6 +504,7 @@ class Purchase extends BaseController
             'end' => isset($params['end']) ? $params['end'] : '',
             'search' => isset($params['search']) ? $params['search'] : '',
             'merchantId' => isset($params['merchantId']) ? $params['merchantId'] : '',
+            'shopId'=>isset($params['shopId']) ? $params['shopId'] : '',
         ];
         $pageParams = pageToOffset($params['page'] ? : 1, $params['pageSize'] ? : 10);
         $selectParams['limit'] = $pageParams['limit'];

+ 3 - 0
Model/Purchase/MPurchase.Class.php

@@ -973,6 +973,9 @@ class MPurchase extends MBaseModel
         if(!empty($selectParams['merchantId'])){
             $whereSql .= ' and p.merchantId = '.$selectParams['merchantId'];
         }
+        if(!empty($selectParams['shopId'])){
+            $whereSql .= ' and p.shopId = '.$selectParams['shopId'];
+        }
         if(!empty($selectParams['categoryId'])){
             $whereSql .= ' and g.categoryId = '.$selectParams['categoryId'];
         }