郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 718a180fd9c599bd982bbbc84ea339eac18a96ea 1 个父辈 a0b4aed0
1 个管道 的构建 通过 耗费 1 秒

修改短信

内嵌 并排对比
正在显示 3 个修改的文件 包含 20 行增加 和 23 行删除
... ... @@ -5,9 +5,7 @@
</component>
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -109,8 +107,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="444">
<caret line="605" column="33" lean-forward="true" selection-start-line="605" selection-start-column="33" selection-end-line="605" selection-end-column="33" />
<state relative-caret-position="411">
<caret line="613" column="24" lean-forward="true" selection-start-line="613" selection-start-column="24" selection-end-line="613" selection-end-column="24" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
... ... @@ -126,8 +124,9 @@
<element signature="e#16282#16675#0#PHP" expanded="false" />
<element signature="e#16702#20180#0#PHP" expanded="false" />
<element signature="e#20209#23114#0#PHP" expanded="false" />
<element signature="e#24098#25354#0#PHP" expanded="false" />
<element signature="e#29538#29755#0#PHP" expanded="false" />
<element signature="e#24032#25288#0#PHP" expanded="false" />
<element signature="e#25334#28839#0#PHP" expanded="false" />
<element signature="e#29497#29714#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -234,9 +233,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="389" />
<option name="y" value="45" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="298" />
<option name="y" value="72" />
<option name="width" value="1393" />
<option name="height" value="948" />
</component>
... ... @@ -436,7 +435,7 @@
<workItem from="1583799928944" duration="18981000" />
<workItem from="1583826020973" duration="10927000" />
<workItem from="1583848752159" duration="3638000" />
<workItem from="1583886688361" duration="5166000" />
<workItem from="1583886688361" duration="5733000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -463,7 +462,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="602305000" />
<option name="totallyTimeSpent" value="602872000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -475,17 +474,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" />
<frame x="298" y="72" width="1393" height="948" extended-state="1" />
<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.1401919" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19729933" 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" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4678999" 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.4673243" 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" />
... ... @@ -997,8 +995,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="444">
<caret line="605" column="33" lean-forward="true" selection-start-line="605" selection-start-column="33" selection-end-line="605" selection-end-column="33" />
<state relative-caret-position="411">
<caret line="613" column="24" lean-forward="true" selection-start-line="613" selection-start-column="24" selection-end-line="613" selection-end-column="24" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
... ... @@ -1014,8 +1012,9 @@
<element signature="e#16282#16675#0#PHP" expanded="false" />
<element signature="e#16702#20180#0#PHP" expanded="false" />
<element signature="e#20209#23114#0#PHP" expanded="false" />
<element signature="e#24098#25354#0#PHP" expanded="false" />
<element signature="e#29538#29755#0#PHP" expanded="false" />
<element signature="e#24032#25288#0#PHP" expanded="false" />
<element signature="e#25334#28839#0#PHP" expanded="false" />
<element signature="e#29497#29714#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -518,9 +518,6 @@ class Pay extends Api
//return_code 表示通信状态
if ($message['return_code'] === 'SUCCESS') {
if ($message['result_code'] === 'SUCCESS') {
//启动事务
Db::startTrans();
//图片
if(!empty($pic_id)){
//将购买次数加1
... ... @@ -614,6 +611,7 @@ class Pay extends Api
}else{
return $fail('通信失败，请稍后再通知我');
}
return true;
});
$response->send();
}
... ...
... ... @@ -7530,7 +7530,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-11 10:09:56 </div>
Generated on 2020-03-11 10:19:24 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...