郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 b365d613bc5da0dbaed97ee712a9d477df6aca57 1 个父辈 538eb0cf
1 个管道 的构建 通过 耗费 0 秒

修改状态

内嵌 并排对比
正在显示 2 个修改的文件 包含 11 行增加 和 11 行删除
... ... @@ -2,7 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -90,8 +89,8 @@
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="334" column="5" lean-forward="true" selection-start-line="334" selection-start-column="5" selection-end-line="334" selection-end-column="5" />
<state relative-caret-position="300">
<caret line="790" column="44" lean-forward="false" selection-start-line="790" selection-start-column="44" selection-end-line="790" selection-end-column="44" />
<folding>
<element signature="e#574#693#0#PHP" expanded="false" />
<element signature="e#699#1012#0#PHP" expanded="false" />
... ... @@ -117,7 +116,7 @@
<element signature="e#34685#35942#0#PHP" expanded="false" />
<element signature="e#35963#39469#0#PHP" expanded="false" />
<element signature="e#38043#38430#0#PHP" expanded="false" />
<element signature="e#40209#47381#0#PHP" expanded="false" />
<element signature="e#40210#47382#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -368,7 +367,7 @@
<workItem from="1575592025964" duration="640000" />
<workItem from="1575599624364" duration="95000" />
<workItem from="1575680867057" duration="23412000" />
<workItem from="1575708184460" duration="1171000" />
<workItem from="1575708184460" duration="1282000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -381,7 +380,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="334482000" />
<option name="totallyTimeSpent" value="334593000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -394,6 +393,7 @@
</component>
<component name="ToolWindowManager">
<frame x="57" y="50" width="1871" height="997" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1722805" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
... ... @@ -402,7 +402,7 @@
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15813954" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15813954" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -861,8 +861,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="334" column="5" lean-forward="true" selection-start-line="334" selection-start-column="5" selection-end-line="334" selection-end-column="5" />
<state relative-caret-position="300">
<caret line="790" column="44" lean-forward="false" selection-start-line="790" selection-start-column="44" selection-end-line="790" selection-end-column="44" />
<folding>
<element signature="e#574#693#0#PHP" expanded="false" />
<element signature="e#699#1012#0#PHP" expanded="false" />
... ... @@ -888,7 +888,7 @@
<element signature="e#34685#35942#0#PHP" expanded="false" />
<element signature="e#35963#39469#0#PHP" expanded="false" />
<element signature="e#38043#38430#0#PHP" expanded="false" />
<element signature="e#40209#47381#0#PHP" expanded="false" />
<element signature="e#40210#47382#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -788,7 +788,7 @@ class Pay extends Api
$result = $this->sms($mobile,$str);
}
//支付成功，更新订单状态
$toporder['status'] = 2;
$toporder['status'] = 20;
$toporder['paytime'] = time();
Db::name('order')->where('num',$message['out_trade_no'])->update($toporder);
}else{
... ...