郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 170ffb33c8fcdbbf5e4fb85d2768a20b5a6f5ea4 1 个父辈 cd073f0b
1 个管道 的构建 通过 耗费 8 秒

修改订单

内嵌 并排对比
正在显示 2 个修改的文件 包含 38 行增加 和 119 行删除
... ... @@ -17,8 +17,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="210">
<caret line="303" column="41" lean-forward="false" selection-start-line="303" selection-start-column="41" selection-end-line="303" selection-end-column="41" />
<state relative-caret-position="409">
<caret line="608" column="5" lean-forward="true" selection-start-line="608" selection-start-column="5" selection-end-line="608" selection-end-column="5" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#574#693#0#PHP" expanded="false" />
... ... @@ -27,9 +27,12 @@
<element signature="e#3098#3418#0#PHP" expanded="false" />
<element signature="e#3423#5504#0#PHP" expanded="false" />
<element signature="e#5510#5928#0#PHP" expanded="false" />
<element signature="e#5933#13230#0#PHP" expanded="false" />
<element signature="e#7569#7857#0#PHP" expanded="false" />
<element signature="e#7934#8207#0#PHP" expanded="false" />
<element signature="e#9276#10320#0#PHP" expanded="false" />
<element signature="e#13247#13544#0#PHP" expanded="false" />
<element signature="e#13550#13943#0#PHP" expanded="false" />
<element signature="e#13949#14369#0#PHP" expanded="false" />
<element signature="e#14374#21670#0#PHP" expanded="false" />
<element signature="e#16008#16296#0#PHP" expanded="false" />
... ... @@ -38,14 +41,14 @@
<element signature="e#17185#17636#0#PHP" expanded="false" />
<element signature="e#17713#18757#0#PHP" expanded="false" />
<element signature="e#18851#18969#0#PHP" expanded="false" />
<element signature="e#21697#25399#0#PHP" expanded="false" />
<element signature="e#25429#28373#0#PHP" expanded="false" />
<element signature="e#28402#31852#0#PHP" expanded="false" />
<element signature="e#29278#29883#0#PHP" expanded="false" />
<element signature="e#29904#31341#0#PHP" expanded="false" />
<element signature="e#31389#31491#0#PHP" expanded="false" />
<element signature="e#31881#35618#0#PHP" expanded="false" />
<element signature="e#35641#35858#0#PHP" expanded="false" />
<element signature="e#21697#25124#0#PHP" expanded="false" />
<element signature="e#25154#28055#0#PHP" expanded="false" />
<element signature="e#28084#31534#0#PHP" expanded="false" />
<element signature="e#28960#29565#0#PHP" expanded="false" />
<element signature="e#29586#31023#0#PHP" expanded="false" />
<element signature="e#31071#31173#0#PHP" expanded="false" />
<element signature="e#31563#35300#0#PHP" expanded="false" />
<element signature="e#35323#35540#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -137,9 +140,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="439" />
<option name="y" value="77" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="320" />
<option name="y" value="82" />
<option name="width" value="1399" />
<option name="height" value="945" />
</component>
... ... @@ -158,8 +161,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -261,7 +264,8 @@
<workItem from="1574759184313" duration="4793000" />
<workItem from="1574814989178" duration="1007000" />
<workItem from="1574831367903" duration="17171000" />
<workItem from="1574849431656" duration="8613000" />
<workItem from="1574849431656" duration="8641000" />
<workItem from="1574900416229" duration="810000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -274,7 +278,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="279441000" />
<option name="totallyTimeSpent" value="280279000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -286,17 +290,17 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="439" y="77" width="1399" height="945" extended-state="0" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<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.18969381" 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.13752665" 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.33" 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="true" show_stripe_button="true" weight="0.13613862" 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="true" show_stripe_button="true" weight="0.11969532" 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" />
... ... @@ -500,7 +504,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="307">
<caret line="34" column="20" lean-forward="false" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
... ... @@ -529,7 +532,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
... ... @@ -544,7 +546,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
... ... @@ -552,7 +553,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="531">
<caret line="79" column="0" lean-forward="true" selection-start-line="79" selection-start-column="0" selection-end-line="79" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -574,7 +574,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
... ... @@ -582,11 +581,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="203">
<caret line="26" column="22" lean-forward="true" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />
<folding>
<element signature="e#1386#1991#0#PHP" expanded="false" />
<element signature="e#2012#3449#0#PHP" expanded="false" />
<element signature="e#3497#3599#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -643,7 +637,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="3" column="39" lean-forward="false" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
... ... @@ -651,72 +644,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1705">
<caret line="1701" column="27" lean-forward="false" selection-start-line="1701" selection-start-column="27" selection-end-line="1701" selection-end-column="27" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4206#0#PHP" expanded="false" />
<element signature="e#4212#4619#0#PHP" expanded="false" />
<element signature="e#4624#4967#0#PHP" expanded="false" />
<element signature="e#4973#5810#0#PHP" expanded="false" />
<element signature="e#5815#8010#0#PHP" expanded="false" />
<element signature="e#8016#8661#0#PHP" expanded="false" />
<element signature="e#8666#9762#0#PHP" expanded="false" />
<element signature="e#9768#10557#0#PHP" expanded="false" />
<element signature="e#10562#11886#0#PHP" expanded="false" />
<element signature="e#11892#12594#0#PHP" expanded="false" />
<element signature="e#12599#13799#0#PHP" expanded="false" />
<element signature="e#13805#14381#0#PHP" expanded="false" />
<element signature="e#14386#14933#0#PHP" expanded="false" />
<element signature="e#14939#15623#0#PHP" expanded="false" />
<element signature="e#15628#17724#0#PHP" expanded="false" />
<element signature="e#17730#18600#0#PHP" expanded="false" />
<element signature="e#18605#21101#0#PHP" expanded="false" />
<element signature="e#21107#21484#0#PHP" expanded="false" />
<element signature="e#21489#21810#0#PHP" expanded="false" />
<element signature="e#21816#22321#0#PHP" expanded="false" />
<element signature="e#22326#22577#0#PHP" expanded="false" />
<element signature="e#22583#23062#0#PHP" expanded="false" />
<element signature="e#23067#23824#0#PHP" expanded="false" />
<element signature="e#23830#24311#0#PHP" expanded="false" />
<element signature="e#24316#25086#0#PHP" expanded="false" />
<element signature="e#25092#25455#0#PHP" expanded="false" />
<element signature="e#25460#25651#0#PHP" expanded="false" />
<element signature="e#25657#26015#0#PHP" expanded="false" />
<element signature="e#26020#26211#0#PHP" expanded="false" />
<element signature="e#26217#27360#0#PHP" expanded="false" />
<element signature="e#27365#30030#0#PHP" expanded="false" />
<element signature="e#30036#30534#0#PHP" expanded="false" />
<element signature="e#30539#32285#0#PHP" expanded="false" />
<element signature="e#32291#32704#0#PHP" expanded="false" />
<element signature="e#32709#33188#0#PHP" expanded="false" />
<element signature="e#33194#33728#0#PHP" expanded="false" />
<element signature="e#33733#35118#0#PHP" expanded="false" />
<element signature="e#35124#35778#0#PHP" expanded="false" />
<element signature="e#35783#37736#0#PHP" expanded="false" />
<element signature="e#35937#36023#0#PHP" expanded="false" />
<element signature="e#36112#36200#0#PHP" expanded="false" />
<element signature="e#37742#38502#0#PHP" expanded="false" />
<element signature="e#38507#41216#0#PHP" expanded="false" />
<element signature="e#41242#42073#0#PHP" expanded="false" />
<element signature="e#42079#42499#0#PHP" expanded="false" />
<element signature="e#42504#42987#0#PHP" expanded="false" />
<element signature="e#42993#43799#0#PHP" expanded="false" />
<element signature="e#43804#46958#0#PHP" expanded="false" />
<element signature="e#46973#48301#0#PHP" expanded="false" />
<element signature="e#48317#49344#0#PHP" expanded="false" />
<element signature="e#49350#50108#0#PHP" expanded="false" />
<element signature="e#50113#53856#0#PHP" expanded="false" />
<element signature="e#53862#54254#0#PHP" expanded="false" />
<element signature="e#54259#55211#0#PHP" expanded="false" />
<element signature="e#55235#55808#0#PHP" expanded="false" />
<element signature="e#55814#56413#0#PHP" expanded="false" />
<element signature="e#56418#57345#0#PHP" expanded="false" />
<element signature="e#57351#58065#0#PHP" expanded="false" />
<element signature="e#58071#58498#0#PHP" expanded="false" />
<element signature="e#58503#58972#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -724,7 +651,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1200">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -732,7 +658,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="591">
<caret line="59" column="7" lean-forward="true" selection-start-line="59" selection-start-column="7" selection-end-line="59" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
... ... @@ -740,7 +665,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="489">
<caret line="82" column="6" lean-forward="true" selection-start-line="82" selection-start-column="6" selection-end-line="82" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
... ... @@ -748,7 +672,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-525">
<caret line="16" column="27" lean-forward="true" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
... ... @@ -756,14 +679,13 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1644">
<caret line="66" column="50" lean-forward="false" selection-start-line="66" selection-start-column="50" selection-end-line="66" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="303" column="41" lean-forward="false" selection-start-line="303" selection-start-column="41" selection-end-line="303" selection-end-column="41" />
<state relative-caret-position="409">
<caret line="608" column="5" lean-forward="true" selection-start-line="608" selection-start-column="5" selection-end-line="608" selection-end-column="5" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#574#693#0#PHP" expanded="false" />
... ... @@ -772,9 +694,12 @@
<element signature="e#3098#3418#0#PHP" expanded="false" />
<element signature="e#3423#5504#0#PHP" expanded="false" />
<element signature="e#5510#5928#0#PHP" expanded="false" />
<element signature="e#5933#13230#0#PHP" expanded="false" />
<element signature="e#7569#7857#0#PHP" expanded="false" />
<element signature="e#7934#8207#0#PHP" expanded="false" />
<element signature="e#9276#10320#0#PHP" expanded="false" />
<element signature="e#13247#13544#0#PHP" expanded="false" />
<element signature="e#13550#13943#0#PHP" expanded="false" />
<element signature="e#13949#14369#0#PHP" expanded="false" />
<element signature="e#14374#21670#0#PHP" expanded="false" />
<element signature="e#16008#16296#0#PHP" expanded="false" />
... ... @@ -783,14 +708,14 @@
<element signature="e#17185#17636#0#PHP" expanded="false" />
<element signature="e#17713#18757#0#PHP" expanded="false" />
<element signature="e#18851#18969#0#PHP" expanded="false" />
<element signature="e#21697#25399#0#PHP" expanded="false" />
<element signature="e#25429#28373#0#PHP" expanded="false" />
<element signature="e#28402#31852#0#PHP" expanded="false" />
<element signature="e#29278#29883#0#PHP" expanded="false" />
<element signature="e#29904#31341#0#PHP" expanded="false" />
<element signature="e#31389#31491#0#PHP" expanded="false" />
<element signature="e#31881#35618#0#PHP" expanded="false" />
<element signature="e#35641#35858#0#PHP" expanded="false" />
<element signature="e#21697#25124#0#PHP" expanded="false" />
<element signature="e#25154#28055#0#PHP" expanded="false" />
<element signature="e#28084#31534#0#PHP" expanded="false" />
<element signature="e#28960#29565#0#PHP" expanded="false" />
<element signature="e#29586#31023#0#PHP" expanded="false" />
<element signature="e#31071#31173#0#PHP" expanded="false" />
<element signature="e#31563#35300#0#PHP" expanded="false" />
<element signature="e#35323#35540#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -498,8 +498,6 @@ class Pay extends Api
$info = Db::name('user')->where('id',$data['user_id'])->update(['money'=>$list['money']]);
if($res && $info){
true;
}else{
$this->error(['code'=>2,'msg'=>'充值失败']);
}
// 提交事务
Db::commit();
... ... @@ -510,8 +508,6 @@ class Pay extends Api
$info = Db::name('user')->where('id',$data['user_id'])->update($list);
if($res && $info){
true;
}else{
$this->error(['code'=>2,'msg'=>'充值失败']);
}
// 提交事务
Db::commit();
... ... @@ -524,8 +520,6 @@ class Pay extends Api
$info = Db::name('user')->where('id',$data['user_id'])->update(['money'=>$list['money']]);
if($res && $info){
true;
}else{
$this->error(['code'=>2,'msg'=>'充值失败']);
}
// 提交事务
Db::commit();
... ... @@ -534,6 +528,7 @@ class Pay extends Api
dump($e->getMessage());
// 回滚事务
Db::rollback();
$this->error(['code'=>2,'msg'=>'充值失败']);
}
}else{
//支付失败
... ... @@ -578,8 +573,6 @@ class Pay extends Api
$info = Db::name('user')->where('id',$data['user_id'])->update($list);
if($res && $info){
true;
}else{
$this->error(['code'=>2,'msg'=>'开通会员失败']);
}
// 提交事务
Db::commit();
... ... @@ -599,6 +592,7 @@ class Pay extends Api
dump($e->getMessage());
// 回滚事务
Db::rollback();
$this->error(['code'=>2,'msg'=>'开通会员失败']);
}
$this->success('SUCCESS','支付成功');
}else{
... ...