commit

.idea/workspace.xml

@@ -6,6 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="9df7b838-09db-466a-bed4-3e1ac8c3624d" name="变更" comment="commit">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/api/controller/auction/AuctionOrderController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/auction/AuctionOrderController.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/api/controller/auction/AuctionProductController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/auction/AuctionProductController.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -199,7 +200,9 @@
       <workItem from="1662446711007" duration="679000" />
       <workItem from="1662511039997" duration="2602000" />
       <workItem from="1663571518710" duration="2083000" />
-      <workItem from="1664326280454" duration="110000" />
+      <workItem from="1664326280454" duration="733000" />
+      <workItem from="1664331541091" duration="640000" />
+      <workItem from="1664414578175" duration="1915000" />
     </task>
     <task id="LOCAL-00001" summary="commit">
       <created>1655962607195</created>
@@ -341,7 +344,14 @@
       <option name="project" value="LOCAL" />
       <updated>1663572376773</updated>
     </task>
-    <option name="localTasksCounter" value="21" />
+    <task id="LOCAL-00021" summary="commit">
+      <created>1664326410270</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1664326410270</updated>
+    </task>
+    <option name="localTasksCounter" value="22" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

app/api/controller/auction/AuctionOrderController.php

@@ -103,6 +103,7 @@ class AuctionOrderController
 
         $order = AuctionOrder::where('order_id', $data['order_id'])->find();
         if (!$order) return app('json')->fail('订单不存在');
+        if ($order['status'] == 3)  return app('json')->fail('当前订单已完成');
         $auction = Auction::where('id', $order['auction_id'])->find();
         if (strtotime($auction['radd_time']) > time() or strtotime($auction['rend_time']) < time()) return app('json')->fail('未到支付时间,支付时间为'.$auction['radd_time'].'-'.$auction['rend_time']);
         $order['upload_image'] = $data['image'];

app/api/controller/auction/AuctionProductController.php

@@ -425,6 +425,7 @@ class AuctionProductController
 
         $details = $productModel->find($data['id']);
         if (!$details)  return app('json')->fail('商品不存在');
+        if ($details['uid'] != $request->uid()) return app('json')->fail('当前商品不属于你');
         $order = AuctionOrder::where([['product_id', '=', $details['id']], ['status', '<', 3], ['status', '>', 0]])->find();
         if ($order) return app('json')->fail('商品已出售，无法取消');