hrjy 2 年之前
父節點
當前提交
1a531930fe
共有 2 個文件被更改,包括 11 次插入5 次删除
  1. 10 5
      .idea/workspace.xml
  2. 1 0
      app/api/controller/auction/AuctionProductController.php

+ 10 - 5
.idea/workspace.xml

@@ -6,10 +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/admin/controller/setting/SystemConfig.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/setting/SystemConfig.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/api/controller/AuthController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/AuthController.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" />
-      <change beforePath="$PROJECT_DIR$/app/api/controller/user/UserController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/user/UserController.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -200,7 +197,8 @@
       <workItem from="1661905981468" duration="2371000" />
       <workItem from="1661992349251" duration="1809000" />
       <workItem from="1662446711007" duration="679000" />
-      <workItem from="1662511039997" duration="548000" />
+      <workItem from="1662511039997" duration="2602000" />
+      <workItem from="1663571518710" duration="832000" />
     </task>
     <task id="LOCAL-00001" summary="commit">
       <created>1655962607195</created>
@@ -328,7 +326,14 @@
       <option name="project" value="LOCAL" />
       <updated>1660627670433</updated>
     </task>
-    <option name="localTasksCounter" value="19" />
+    <task id="LOCAL-00019" summary="commit">
+      <created>1662511628191</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1662511628191</updated>
+    </task>
+    <option name="localTasksCounter" value="20" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

+ 1 - 0
app/api/controller/auction/AuctionProductController.php

@@ -251,6 +251,7 @@ class AuctionProductController
         try {
             Db::startTrans();
             $product = AuctionProduct::find($order['product_id']);
+            if ($product['uid'] == $order['uid'])  return app('json')->fail('商品已发放');
             if (!$product) return app('json')->fail('数据不存在');
             $uid = $product['uid']; // 所属人id