1

.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Base.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Base.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Trolley.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Trolley.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -420,7 +420,7 @@
       <workItem from="1694392543142" duration="23428000" />
       <workItem from="1694480523673" duration="21063000" />
       <workItem from="1694565971470" duration="21552000" />
-      <workItem from="1694652561038" duration="17210000" />
+      <workItem from="1694652561038" duration="17748000" />
     </task>
     <servers />
   </component>

application/api/controller/Trolley.php

@@ -219,7 +219,7 @@ class Trolley extends Base
             if($goods_info['item_list'][0]['stock'] < $num) throw new Exception('库存不足');
             $trolley_id = ShoppingTrolley::checkTrolley($this->user_id,$goods_id,$spec_id);
             // 添加到购物车
-            if($trolley_id != $change_id) {
+            if($trolley_id && $trolley_id != $change_id) {
                 ShoppingTrolley::where('id',$trolley_id)->setInc('num',$num);
                 ShoppingTrolley::where('id',$change_id)->delete();// 删除购物车
             }else{