Merge branch 'hotfix_array_unique' into 'test'

Hotfix array unique

See merge request bp/goods!10

application/modules/Marketing/controllers/Marketingfororder.php

@@ -39,7 +39,7 @@ class MarketingfororderController extends Base
         $addressList = [];
         //
         if (!empty($takePlaceList))
-            $addressList =  array_unique(array_column($takePlaceList, 'address'));
+            $addressList =  array_values(array_unique(array_column($takePlaceList, 'address')));
         //
         $this->success(["result" => [
             'take_place_list' => $takePlaceList,

application/services/marketing/MarketingForOrderService.php

@@ -24,7 +24,7 @@ class MarketingForOrderService
     {
         $where['marketing_type'] = !empty($params['marketing_type']) ? $params['marketing_type'] : Marketing::MARKETING_TYPE_PINDAN;
         $where['life_account_id'] = MarketingService::getPublicLifeAccountId();
-        return Marketing::select(["marketing_id", "marketing_name", "create_time"], ["marketing_type" => $where['marketing_type']]);
+        return Marketing::select(["marketing_id", "marketing_name", "create_time"], $where);
     }
 
     /**