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

application/models/marketing/mysql/Marketing.php

@@ -66,10 +66,6 @@ class Marketing extends MysqlBase
             $colums = '*';
         }
 
-        if (!empty($where['marketing_name'])) {
-            $where['marketing_name'] = $where['marketing_name'];
-        }
-
         if (!empty($where)) {
             $data = self::formatWhere($where);
         }
@@ -103,7 +99,8 @@ class Marketing extends MysqlBase
         $data = [];
        
         if (!empty($where['marketing_name'])) {
-            $data['marketing_name[~]'] = $where['marketing_name'];
+            //$data['marketing_name[~]'] = $where['marketing_name'];
+            $data['marketing_name'] = $where['marketing_name'];
         }
 
         if (!empty($where['marketing_id'])) {

application/services/marketing/DistributorService.php

@@ -182,9 +182,9 @@ class DistributorService
         }
 
         $jwUserId = '';
-        if (empty($distributorCode)) {
-            throw new DistributorException(['cus'=>9]);
-        }
+        // if (empty($distributorCode)) {
+        //     throw new DistributorException(['cus'=>9]);
+        // }
         $info = Distributor::getRecord(['user_id' => $shareUserId]);
 
         if (empty($info)) {

application/services/marketing/MarketingService.php

@@ -65,7 +65,7 @@ class MarketingService
         }
         
         $goodsSkuList = GoodsSku::select('*', $where);
-        
+
         $lifeAccountIds = [];
         if (!empty($goodsSkuList)) {
             $lifeAccountIds = array_column($goodsSkuList, 'life_account_id');