hrjy 2 years ago
parent
commit
4870da4388
2 changed files with 16 additions and 6 deletions
  1. 14 4
      .idea/workspace.xml
  2. 2 2
      app/models/auction/AuctionOrder.php

+ 14 - 4
.idea/workspace.xml

@@ -6,8 +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" />
+      <change beforePath="$PROJECT_DIR$/app/models/auction/AuctionOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/models/auction/AuctionOrder.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -202,7 +201,11 @@
       <workItem from="1663571518710" duration="2083000" />
       <workItem from="1664326280454" duration="733000" />
       <workItem from="1664331541091" duration="640000" />
-      <workItem from="1664414578175" duration="1915000" />
+      <workItem from="1664414578175" duration="2857000" />
+      <workItem from="1665211695129" duration="1209000" />
+      <workItem from="1665468383954" duration="1327000" />
+      <workItem from="1665556257828" duration="363000" />
+      <workItem from="1665713235609" duration="25000" />
     </task>
     <task id="LOCAL-00001" summary="commit">
       <created>1655962607195</created>
@@ -351,7 +354,14 @@
       <option name="project" value="LOCAL" />
       <updated>1664326410270</updated>
     </task>
-    <option name="localTasksCounter" value="22" />
+    <task id="LOCAL-00022" summary="commit">
+      <created>1664416518199</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1664416518199</updated>
+    </task>
+    <option name="localTasksCounter" value="23" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

+ 2 - 2
app/models/auction/AuctionOrder.php

@@ -305,7 +305,7 @@ class AuctionOrder extends BaseModel
                         UserBill::expend('超时扣除', $v['uid'], 'anticipate', 'dec_anticipate', $dedu, $v['uid'], 0, '超时付款,扣除订单'.$v['order_id'].'冻结' . $dedu . '广告值');
                         $fz->save();
 
-                        AuctionOrder::where('create_time', '<', $hour)->where('status', '=', 1)->update(['status' => 0]); // 修改为已过期订单
+                        AuctionOrder::where('id', $v['id'])->where('status', '=', 1)->update(['status' => 0]); // 修改为已过期订单
                     }
 
                 } else {
@@ -337,7 +337,7 @@ class AuctionOrder extends BaseModel
                             UserBill::expend('超时扣除', $v['uid'], 'anticipate', 'dec_anticipate', $dedu, $v['uid'], 0, '超时付款,扣除预约冻结' . $dedu . '广告值');
                             $booking->save();
 
-                            AuctionOrder::where('create_time', '<', $hour)->where('status', '=', 1)->update(['status' => 0]); // 修改为已过期订单
+                            AuctionOrder::where('id', $v['id'])->where('status', '=', 1)->update(['status' => 0]); // 修改为已过期订单
                         }
                     }
                 }