Merge branch 'develop' of https://git.yidian-inc.com:8021/bp/goods into develop

application/modules/Marketing/controllers/Marketing.php

@@ -66,12 +66,36 @@ class MarketingController extends Base
              throw new MarketingException(['cus' => 6]);
         }
         
-        if (!empty($params['audit_status'])) {
-            $param['audit_status'] = $params['audit_status'];
+        if (!empty($params['marketing_name'])) {
+            $param['marketing_name'] = $params['marketing_name'];
         }
 
-        if (!empty($params['audit_user_name'])) {
-            $param['audit_user_name'] = $params['audit_user_name'];
+        if (!empty($params['op_cur_user'])) {
+            $param['update_user_email'] = $params['op_cur_user'];
+        }
+
+        if (!empty($params['online_status'])) {
+            $param['online_status'] = $params['online_status'];
+        }
+
+        if (!empty($params['commission_mode'])) {
+            $param['commission_mode'] = $params['commission_mode'];
+        }
+
+        if (!empty($params['second_commission_value'])) {
+            $param['second_commission_value'] = $params['second_commission_value'];
+        }
+
+        if (!empty($params['first_commission_value'])) {
+            $param['first_commission_value'] = $params['first_commission_value'];
+        }
+
+        if (!empty($params['start_time'])) {
+            $param['start_time'] = $params['start_time'];
+        }
+
+        if (!empty($params['end_time'])) {
+            $param['end_time'] = $params['end_time'];
         }
          
         $srt = MarketingService::updateMarketing($param,$where);

application/services/goods/GoodsService.php

@@ -1147,7 +1147,7 @@ class GoodsService
             $where['goods_name'] = $params['goods_name'];
         }
 
-        $list = GoodsSku::getRecordMaster($where);
+        $list = GoodsSku::getRecords($where);
         return $list;
     }
 

application/services/shop/ShopService.php

@@ -99,8 +99,6 @@ class ShopService
         $address = !empty($params['address']) ? $params['address'] : '';
         $subShopId = !empty($params['sub_shop_id']) ? $params['sub_shop_id'] : '';
 
-        
-
         if (!empty($subShopId)) {
             $where['sub_shop_id'] =  $subShopId;
         }
@@ -123,9 +121,21 @@ class ShopService
     {
         $params['page'] = !empty($params['page']) ? $params['page'] : 1;
         $limit = !empty($params['page_size']) ? $params['page_size'] : 20;
+        $subShopId = !empty($params['sub_shop_id']) ? $params['sub_shop_id'] : '';
+        $lifeAccountId = !empty($params['life_account_id']) ? $params['life_account_id'] : '';
+ 
         $page = ($params['page'] - 1) * $limit;
         $where['ORDER'] = ["create_time" => "DESC"];
         $where['LIMIT'] = [$page, $limit];
+
+        if (!empty($subShopId)) {
+            $where['sub_shop_id'] =  $subShopId;
+        }
+
+        if (!empty($lifeAccountId)) {
+            $where['life_account_id'] =  $lifeAccountId;
+        }
+
         $list = SubShop::getRecords($where);
         unset($where['LIMIT']);
         unset($where['ORDER']);