修改赠品格式不同导致的无数据错误

helper/activity/goods_gift.php

@@ -68,6 +68,23 @@ class goods_gift
             return false;
         }
     }
+    public function goods_giftids($goods_id)
+    {
+        $goods_id = intval($goods_id);
+        if(array_key_exists($goods_id,$this->contents))
+        {
+            $gids = [];
+            $content = $this->contents[$goods_id];
+            foreach ($content as $gift) {
+                $gids[] = $gift['gift_goods_id'];
+            }
+            return $gids;
+        } else {
+            return false;
+        }
+    }
+
+
     public function have_gift($goods_id)
     {
         $goods_id = intval($goods_id);

helper/activity_helper.php

@@ -66,6 +66,9 @@ class activity_helper
     public static function goods_gifts($goods_id) {
         return activity\goods_gift::instance()->gifts($goods_id);
     }
+    public static function goods_giftids($goods_id) {
+        return activity\goods_gift::instance()->goods_giftids($goods_id);
+    }
 
     //商品组合
     public static function have_combo($goods_id) {

helper/model/goods_summary.php

@@ -140,7 +140,7 @@ class goods_summary
             $combos = activity_helper::combo_goods($this->goods_id);
         }
         if(activity_helper::have_gift($this->goods_id)) {
-            $gifts = activity_helper::goods_gifts($this->goods_id);
+            $gifts = activity_helper::goods_giftids($this->goods_id);
         }
 
         foreach ($this->bundles as $bl_id) {
@@ -148,9 +148,7 @@ class goods_summary
             $bundles = array_merge($bundles,$gids);
         }
 
-        $ret = array_merge($combos,$gifts);
-        $ret = array_merge($ret,$bundles);
-
+        $ret = array_merge($combos,$gifts,$bundles);
         return array_unique($ret);
     }
 }