Merge branch 'feature-deliver210913' into develop

application/models/marketing/mysql/TakePlace.php

@@ -34,4 +34,12 @@ class TakePlace extends MysqlBase
         $exist = self::getRecord(['take_place_name' => $takePlaceName], ['take_place_id']);
         return !empty($exist);
     }
+
+    public static function save($data, $where = [])
+    {
+        if (empty($where)) {
+            return self::insert($data, []);
+        }
+        return self::update($data, $where);
+    }
 }

application/modules/Marketing/controllers/Marketinggoods.php

@@ -12,7 +12,7 @@ use App\Services\goods\GoodsService;
 
 class MarketinggoodsController extends Base
 {
-    const KS3_BASE_URL = 'ks3-cn-beijing.ksyun.com';
+    const KS3_BASE_URL = 'ks3-cn-beijing.ksyuncs.com';
     /**
      * 获取全部生效营销活动商品列表
      *

application/services/marketing/BusinessCircleService.php

@@ -93,6 +93,6 @@ class BusinessCircleService
         unset($where['LIMIT']);
         unset($where['ORDER']);
         $count = BusinessCircle::count("*", $where);
-        return ['result' => $list, 'count' => $count];
+        return ['list' => $list, 'count' => $count];
     }
 }
\ No newline at end of file

application/services/marketing/TagService.php

@@ -9,6 +9,7 @@ namespace App\Services\marketing;
 
 use App\Exception\custom\MarketingException;
 use App\Models\marketing\mysql\Tag;
+use App\Models\marketing\mysql\TakePlace;
 
 class TagService
 {
@@ -65,7 +66,16 @@ class TagService
         $tagId = $params["tag_id"];
         $data = [];
         $data["is_delete"] = empty($params["is_delete"]) ? 0 : $params["is_delete"];
-        return Tag::save($data, ["tag_id" => $tagId]);
+
+        $deleteRes = Tag::save($data, ["tag_id" => $tagId]);
+        if (!empty($data["is_delete"])) {
+            $takePlaceIds = TakePlace::getRecords(["tag_id" => $tagId], ["take_place_id"]);
+            if (!empty($takePlaceIds)) {
+                $ids = array_column($takePlaceIds, "take_place_id");
+                TakePlace::save(["tag_id" => 0], ["take_place_id" => $ids]);
+            }
+        }
+        return $deleteRes;
     }
 
     /**