From 69806ca87dc6561b95d9a19ff6ca1b7e6830f374 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Tue, 10 Dec 2024 11:22:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E6=A3=80+=E8=87=AA=E9=80=89=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4=E7=9B=B8=E5=90=8C=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/Http/Controllers/API/H5/ComboController.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php
index efccb2d..8ad28da 100644
--- a/Laravel/app/Http/Controllers/API/H5/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php
@@ -362,10 +362,12 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
       }
     }
     $items_info = false;//自选项目信息
+    $zixuan_item=[];
     if (isset($item_ids) and !empty($item_ids)) {
       $item_price = 0;
       $items_original_price = 0;
       $items = DB::table('items')->whereIn('item_id', $item_ids)->where(['status' => 1])->get();
+      $zixuan_item=$items;
       $groupedData = [];
       foreach ($items as $item) {
         //判断套餐项目和自选项目是否冲突
@@ -454,6 +456,17 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
         }
       }
       $group_info[0]['items'] =array_merge($group_info[0]['items'],$Nx1_arrInfo); //合并多选一
+
+      foreach ($zixuan_item as $item) {
+        //判断团检套餐项目和自选项目是否冲突
+        if (isset( $group_info[0]['items'])) {
+          foreach ( $group_info[0]['items'] as  $group_info_item) {
+            if ($group_info_item['id'] == $item->item_id) return \Yz::echoError1($item->name . "已经存在，不可重复选择");
+          }
+        }
+      }
+
+
 // return \Yz::Return(true,"",$group_info[0]['items']);
       $all_items = DB::table('items')->where(['status' => 1])->get();
       $item_new = [];