@@ -1,10 +1,7 @@
<?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="">
- <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>
+ <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -445,7 +442,7 @@
<workItem from="1695085328694" duration="21844000" />
<workItem from="1695603648860" duration="24367000" />
<workItem from="1695689784219" duration="10180000" />
- <workItem from="1695776444503" duration="751000" />
+ <workItem from="1695776444503" duration="757000" />
</task>
<servers />
</component>
@@ -536,7 +536,7 @@ class Order extends Base
foreach ($list as &$info) {
$auto_time = 86400 - (time() - strtotime($info['create_at'])) ;
$info['auto_time'] = $auto_time > 0 && $info['status'] == 0 ? $auto_time :0;
- $info['expire_time'] = date('Y-m-d H:i:s',strtotime($info['create_at'])+ 86400));
+ $info['expire_time'] = date('Y-m-d H:i:s',strtotime($info['create_at'])+ 86400);
$bill_info = BillApply::field('id,header,type,phone,email,bank,card_no,identify_number,bill_img,remark')->where(['order_type'=>2,'order_id'=>$info['id']])->find();
$info['bill_info'] = !empty($bill_info) ? $bill_info->toArray() : null;
foreach ($info['order_item'] as &$v) {