wupengfei 1 år sedan
förälder
incheckning
d952857666
2 ändrade filer med 6 tillägg och 2 borttagningar
  1. 5 2
      .idea/workspace.xml
  2. 1 0
      application/api/controller/Order.php

+ 5 - 2
.idea/workspace.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="" />
+    <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/Order.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Order.php" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -442,7 +445,7 @@
       <workItem from="1695085328694" duration="21844000" />
       <workItem from="1695603648860" duration="24367000" />
       <workItem from="1695689784219" duration="10180000" />
-      <workItem from="1695776444503" duration="757000" />
+      <workItem from="1695776444503" duration="821000" />
     </task>
     <servers />
   </component>

+ 1 - 0
application/api/controller/Order.php

@@ -456,6 +456,7 @@ class Order extends Base
      * @return name:id type:int default:--  desc:订单id
      * @return name:id type:int default:--  desc:订单id
      * @return name:auto_time type:int default:--  desc:自动取消时间单位秒
+     * @return name:expire_time type:string default:--  desc:支付到期时间
      * @return name:order_no type:string default:--  desc:订单号
      * @return name:price_total type:float default:--  desc:待支付金额(商品价格+运费)
      * @return name:price_goods type:float default:--  desc:商品金额