郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 77a3f9600c50fa043c84a9f74e13128152c80934 1 个父辈 11a0bb68
1 个管道 的构建 通过 耗费 6 秒

修改回调

内嵌 并排对比
正在显示 4 个修改的文件 包含 252 行增加 和 105 行删除
... ... @@ -2,6 +2,8 @@
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
... ... @@ -14,11 +16,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="512">
<caret line="1224" column="5" lean-forward="true" selection-start-line="1224" selection-start-column="5" selection-end-line="1224" selection-end-column="5" />
<state relative-caret-position="1500">
<caret line="675" column="5" lean-forward="false" selection-start-line="675" selection-start-column="5" selection-end-line="675" selection-end-column="5" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -46,28 +48,53 @@
<element signature="e#19397#19648#0#PHP" expanded="false" />
<element signature="e#19654#20133#0#PHP" expanded="false" />
<element signature="e#20138#20895#0#PHP" expanded="false" />
<element signature="e#20901#21264#0#PHP" expanded="false" />
<element signature="e#21269#21460#0#PHP" expanded="false" />
<element signature="e#21466#21824#0#PHP" expanded="false" />
<element signature="e#21829#22019#0#PHP" expanded="false" />
<element signature="e#22025#23168#0#PHP" expanded="false" />
<element signature="e#23173#25838#0#PHP" expanded="false" />
<element signature="e#25844#26342#0#PHP" expanded="false" />
<element signature="e#26347#27434#0#PHP" expanded="false" />
<element signature="e#27440#27853#0#PHP" expanded="false" />
<element signature="e#27858#28337#0#PHP" expanded="false" />
<element signature="e#28343#28877#0#PHP" expanded="false" />
<element signature="e#28882#29796#0#PHP" expanded="false" />
<element signature="e#29802#30333#0#PHP" expanded="false" />
<element signature="e#30338#31257#0#PHP" expanded="false" />
<element signature="e#31263#31912#0#PHP" expanded="false" />
<element signature="e#31917#32790#0#PHP" expanded="false" />
<element signature="e#32796#33216#0#PHP" expanded="false" />
<element signature="e#33221#33704#0#PHP" expanded="false" />
<element signature="e#33710#34305#0#PHP" expanded="false" />
<element signature="e#34310#38959#0#PHP" expanded="false" />
<element signature="e#38965#39531#0#PHP" expanded="false" />
<element signature="e#39536#41642#0#PHP" expanded="false" />
<element signature="e#20901#21382#0#PHP" expanded="false" />
<element signature="e#21387#22157#0#PHP" expanded="false" />
<element signature="e#22163#22526#0#PHP" expanded="false" />
<element signature="e#22531#22722#0#PHP" expanded="false" />
<element signature="e#22728#23086#0#PHP" expanded="false" />
<element signature="e#23091#23281#0#PHP" expanded="false" />
<element signature="e#23287#24430#0#PHP" expanded="false" />
<element signature="e#24435#27100#0#PHP" expanded="false" />
<element signature="e#27106#27604#0#PHP" expanded="false" />
<element signature="e#27609#28696#0#PHP" expanded="false" />
<element signature="e#28702#29115#0#PHP" expanded="false" />
<element signature="e#29120#29599#0#PHP" expanded="false" />
<element signature="e#29605#30139#0#PHP" expanded="false" />
<element signature="e#30144#31058#0#PHP" expanded="false" />
<element signature="e#31064#31595#0#PHP" expanded="false" />
<element signature="e#31600#32519#0#PHP" expanded="false" />
<element signature="e#32525#33174#0#PHP" expanded="false" />
<element signature="e#33179#34052#0#PHP" expanded="false" />
<element signature="e#34058#34478#0#PHP" expanded="false" />
<element signature="e#34483#34966#0#PHP" expanded="false" />
<element signature="e#34972#35567#0#PHP" expanded="false" />
<element signature="e#35572#40221#0#PHP" expanded="false" />
<element signature="e#40227#40793#0#PHP" expanded="false" />
<element signature="e#40798#42904#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<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="503">
<caret line="190" column="49" lean-forward="false" selection-start-line="190" selection-start-column="49" selection-end-line="190" selection-end-column="49" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
<element signature="e#575#888#0#PHP" expanded="false" />
<element signature="e#893#2938#0#PHP" expanded="false" />
<element signature="e#2944#3264#0#PHP" expanded="false" />
<element signature="e#3269#5320#0#PHP" expanded="false" />
<element signature="e#5326#5744#0#PHP" expanded="false" />
<element signature="e#9607#10027#0#PHP" expanded="false" />
<element signature="e#10032#13872#0#PHP" expanded="false" />
<element signature="e#13899#17601#0#PHP" expanded="false" />
<element signature="e#17630#18460#0#PHP" expanded="false" />
<element signature="e#18489#19322#0#PHP" expanded="false" />
<element signature="e#19345#19562#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -117,7 +144,6 @@
<option value="$PROJECT_DIR$/public/assets/js/backend/user/user.js" />
<option value="$PROJECT_DIR$/application/admin/view/vip/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/vip.js" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
... ... @@ -129,6 +155,7 @@
<option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
<option value="$PROJECT_DIR$/application/extra/verify.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
</list>
</option>
</component>
... ... @@ -147,8 +174,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="634" />
<option name="y" value="58" />
<option name="x" value="218" />
<option name="y" value="37" />
<option name="width" value="1699" />
<option name="height" value="1003" />
</component>
... ... @@ -196,13 +223,13 @@
<select />
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../project/competition" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../scrap1/scrap" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
... ... @@ -243,7 +270,8 @@
<workItem from="1574146994475" duration="23222000" />
<workItem from="1574209189943" duration="37638000" />
<workItem from="1574252363848" duration="8841000" />
<workItem from="1574295812843" duration="12563000" />
<workItem from="1574295812843" duration="20536000" />
<workItem from="1574336957891" duration="152000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -256,7 +284,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="130617000" />
<option name="totallyTimeSpent" value="138742000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -268,17 +296,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="634" y="58" width="1699" height="1003" extended-state="0" />
<editor active="true" />
<frame x="218" y="37" width="1699" height="1003" extended-state="0" />
<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.15253203" 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.15436241" 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.14896074" 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.14896074" 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" />
... ... @@ -399,7 +426,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="33" lean-forward="false" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
... ... @@ -414,7 +440,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="453">
<caret line="112" column="20" lean-forward="false" selection-start-line="112" selection-start-column="20" selection-end-line="112" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
... ... @@ -498,6 +523,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<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>
... ... @@ -505,6 +531,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="411">
<caret line="28" column="9" lean-forward="false" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
... ... @@ -512,6 +539,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="261">
<caret line="25" column="58" lean-forward="false" selection-start-line="25" selection-start-column="58" selection-end-line="25" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
... ... @@ -564,31 +592,10 @@
</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="825">
<caret line="372" column="16" lean-forward="false" selection-start-line="372" selection-start-column="16" selection-end-line="372" selection-end-column="16" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
<element signature="e#575#888#0#PHP" expanded="false" />
<element signature="e#893#2938#0#PHP" expanded="false" />
<element signature="e#2944#3362#0#PHP" expanded="false" />
<element signature="e#3367#7202#0#PHP" expanded="false" />
<element signature="e#7208#7628#0#PHP" expanded="false" />
<element signature="e#7633#11473#0#PHP" expanded="false" />
<element signature="e#11500#13399#0#PHP" expanded="false" />
<element signature="e#13428#14258#0#PHP" expanded="false" />
<element signature="e#14287#15120#0#PHP" expanded="false" />
<element signature="e#15143#15360#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/addons.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="11" lean-forward="true" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
... ... @@ -596,7 +603,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="34" column="105" lean-forward="false" selection-start-line="34" selection-start-column="105" selection-end-line="34" selection-end-column="105" />
<folding />
</state>
</provider>
</entry>
... ... @@ -604,7 +610,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="359">
<caret line="32" column="93" lean-forward="false" selection-start-line="32" selection-start-column="93" selection-end-line="32" selection-end-column="93" />
<folding />
</state>
</provider>
</entry>
... ... @@ -612,7 +617,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="59" column="10" lean-forward="false" selection-start-line="59" selection-start-column="10" selection-end-line="59" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -620,7 +624,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<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>
... ... @@ -628,7 +631,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="441">
<caret line="65" column="10" lean-forward="false" selection-start-line="65" selection-start-column="10" selection-end-line="65" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -636,7 +638,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="427">
<caret line="95" column="10" lean-forward="false" selection-start-line="95" selection-start-column="10" selection-end-line="95" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -644,7 +645,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="427">
<caret line="95" column="10" lean-forward="false" selection-start-line="95" selection-start-column="10" selection-end-line="95" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -652,7 +652,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="427">
<caret line="35" column="10" lean-forward="false" selection-start-line="35" selection-start-column="10" selection-end-line="35" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -660,7 +659,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="427">
<caret line="35" column="10" lean-forward="false" selection-start-line="35" selection-start-column="10" selection-end-line="35" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -668,7 +666,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="16" column="36" lean-forward="true" selection-start-line="16" selection-start-column="36" selection-end-line="16" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
... ... @@ -676,14 +673,13 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="38" lean-forward="false" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="512">
<caret line="1224" column="5" lean-forward="true" selection-start-line="1224" selection-start-column="5" selection-end-line="1224" selection-end-column="5" />
<state relative-caret-position="1500">
<caret line="675" column="5" lean-forward="false" selection-start-line="675" selection-start-column="5" selection-end-line="675" selection-end-column="5" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -711,28 +707,51 @@
<element signature="e#19397#19648#0#PHP" expanded="false" />
<element signature="e#19654#20133#0#PHP" expanded="false" />
<element signature="e#20138#20895#0#PHP" expanded="false" />
<element signature="e#20901#21264#0#PHP" expanded="false" />
<element signature="e#21269#21460#0#PHP" expanded="false" />
<element signature="e#21466#21824#0#PHP" expanded="false" />
<element signature="e#21829#22019#0#PHP" expanded="false" />
<element signature="e#22025#23168#0#PHP" expanded="false" />
<element signature="e#23173#25838#0#PHP" expanded="false" />
<element signature="e#25844#26342#0#PHP" expanded="false" />
<element signature="e#26347#27434#0#PHP" expanded="false" />
<element signature="e#27440#27853#0#PHP" expanded="false" />
<element signature="e#27858#28337#0#PHP" expanded="false" />
<element signature="e#28343#28877#0#PHP" expanded="false" />
<element signature="e#28882#29796#0#PHP" expanded="false" />
<element signature="e#29802#30333#0#PHP" expanded="false" />
<element signature="e#30338#31257#0#PHP" expanded="false" />
<element signature="e#31263#31912#0#PHP" expanded="false" />
<element signature="e#31917#32790#0#PHP" expanded="false" />
<element signature="e#32796#33216#0#PHP" expanded="false" />
<element signature="e#33221#33704#0#PHP" expanded="false" />
<element signature="e#33710#34305#0#PHP" expanded="false" />
<element signature="e#34310#38959#0#PHP" expanded="false" />
<element signature="e#38965#39531#0#PHP" expanded="false" />
<element signature="e#39536#41642#0#PHP" expanded="false" />
<element signature="e#20901#21382#0#PHP" expanded="false" />
<element signature="e#21387#22157#0#PHP" expanded="false" />
<element signature="e#22163#22526#0#PHP" expanded="false" />
<element signature="e#22531#22722#0#PHP" expanded="false" />
<element signature="e#22728#23086#0#PHP" expanded="false" />
<element signature="e#23091#23281#0#PHP" expanded="false" />
<element signature="e#23287#24430#0#PHP" expanded="false" />
<element signature="e#24435#27100#0#PHP" expanded="false" />
<element signature="e#27106#27604#0#PHP" expanded="false" />
<element signature="e#27609#28696#0#PHP" expanded="false" />
<element signature="e#28702#29115#0#PHP" expanded="false" />
<element signature="e#29120#29599#0#PHP" expanded="false" />
<element signature="e#29605#30139#0#PHP" expanded="false" />
<element signature="e#30144#31058#0#PHP" expanded="false" />
<element signature="e#31064#31595#0#PHP" expanded="false" />
<element signature="e#31600#32519#0#PHP" expanded="false" />
<element signature="e#32525#33174#0#PHP" expanded="false" />
<element signature="e#33179#34052#0#PHP" expanded="false" />
<element signature="e#34058#34478#0#PHP" expanded="false" />
<element signature="e#34483#34966#0#PHP" expanded="false" />
<element signature="e#34972#35567#0#PHP" expanded="false" />
<element signature="e#35572#40221#0#PHP" expanded="false" />
<element signature="e#40227#40793#0#PHP" expanded="false" />
<element signature="e#40798#42904#0#PHP" expanded="false" />
</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="503">
<caret line="190" column="49" lean-forward="false" selection-start-line="190" selection-start-column="49" selection-end-line="190" selection-end-column="49" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
<element signature="e#575#888#0#PHP" expanded="false" />
<element signature="e#893#2938#0#PHP" expanded="false" />
<element signature="e#2944#3264#0#PHP" expanded="false" />
<element signature="e#3269#5320#0#PHP" expanded="false" />
<element signature="e#5326#5744#0#PHP" expanded="false" />
<element signature="e#9607#10027#0#PHP" expanded="false" />
<element signature="e#10032#13872#0#PHP" expanded="false" />
<element signature="e#13899#17601#0#PHP" expanded="false" />
<element signature="e#17630#18460#0#PHP" expanded="false" />
<element signature="e#18489#19322#0#PHP" expanded="false" />
<element signature="e#19345#19562#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -83,6 +83,62 @@ class Pay extends Api
}
/**
* @ApiTitle (开通会员支付)
* @ApiSummary (开通会员支付)
* @ApiMethod (POST)
* @ApiRoute (/api/pay/vippay)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="order_id", type="inter", required=true, description="订单id")
*
*/
public function vippay(){
$rule = config('verify.path');
if($this->request->isPost()){
$order_id = $this->request->post('order_id');
$openid = $this->getopenid();
if(empty($openid)){
$this->error(['code'=>2,'msg'=>'openid不能为空']);
}
$data = Db::name('viporder')->where('id',$order_id)->find();
if($data){
if($data['status'] == 2){
$this->error('该订单已支付过了');
}else{
//创建支付对象
$config = config('verify.wx_pay');
$app = Factory::payment($config);
$result = $app->order->unify([
'body' => '山东航拍',
'out_trade_no' => $data['num'],//支付订单号
'total_fee' => $data['money']*100,//单位分
'notify_url' => $rule.'api/pay/vippayOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
'openid' => $openid,
]);
if($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS'){
$params = [
'appId' => $config['app_id'],
'timeStamp' => time(),
'nonceStr' => $result['nonce_str'], // 统一下单返回的随机字符串
'package' => 'prepay_id='.$result['prepay_id'], // 统一下单Id
'signType' => 'MD5', // 签名方法
];
// 注意这里用的是商户平台的Key进行二次签名
$params['paySign'] = generate_sign($params, $config['key']);
$this->success('成功',$params);
}
$this->error($result['err_code_des']);
}
}else{
$this->error('无效的订单');
}
}else{
$this->error('请求方式错误');
}
}
/**
* @ApiTitle (图片购买支付)
* @ApiSummary (图片购买支付)
* @ApiMethod (POST)
... ... @@ -125,8 +181,6 @@ class Pay extends Api
$res = Db::name('order')->where('id',$order_id)->update(['status'=>2,'paytime'=>time()]);
if($res && $arr){
true;
}else{
$this->error('购买失败');
}
// 提交事务
Db::commit();
... ... @@ -134,7 +188,9 @@ class Pay extends Api
dump($e->getMessage());
// 回滚事务
Db::rollback();
$this->error('购买失败');
}
$this->success('SUCCESS','成功');
}
}else{
$this->error('无效的订单');
... ... @@ -294,17 +350,50 @@ class Pay extends Api
// 启动事务
Db::startTrans();
try{
$res = Db::name('toporder')->where('num',$message['out_trade_no'])->update($toporder);
$arr = Db::name('user')->where('id',$data['user_id'])->find();
$list['money'] = $arr['money'] + $money;
$info = Db::name('user')->where('id',$data['user_id'])->update(['money'=>$list['money']]);
if($res && $info){
true;
//判断用户充值金额是否大于等于8000
if($data['money']>=8000){
//大于等于的情况
$res = Db::name('toporder')->where('num',$message['out_trade_no'])->update($toporder);
$arr = Db::name('user')->where('id',$data['user_id'])->find();
//判断用户是否已经是会员了
if($arr['is_vip'] == 0){
//已经是会员
$list['money'] = $arr['money'] + $money;
$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();
}else{
//不是会员
$list['money'] = $arr['money'] + $money;
$list['is_vip'] = 1;
$info = Db::name('user')->where('id',$data['user_id'])->update($list);
if($res && $info){
true;
}else{
$this->error(['code'=>2,'msg'=>'充值失败']);
}
// 提交事务
Db::commit();
}
}else{
$this->error(['code'=>2,'msg'=>'充值失败']);
//小于8000的情况
$res = Db::name('toporder')->where('num',$message['out_trade_no'])->update($toporder);
$arr = Db::name('user')->where('id',$data['user_id'])->find();
$list['money'] = $arr['money'] + $money;
$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();
}
// 提交事务
Db::commit();
} catch (\Exception $e) {
dump($e->getMessage());
// 回滚事务
... ...
... ... @@ -637,6 +637,45 @@ class User extends Api
}
/**
* @ApiTitle (创建开通会员订单)
* @ApiSummary (创建开通会员订单)
* @ApiMethod (POST)
* @ApiRoute (/api/user/viporder)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="total", type="float", required=true, description="金额")
*
* @ApiReturn({
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"order_id"://订单ID
}
})
*/
public function viporder()
{
$param['user_id'] = $this->uid;
$param['total'] = $this->request->post('total');
if(empty( $param['total'])){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}elseif ( $param['total']<=8000){
$this->error(['code'=>3,'msg'=>'开通会员至少需要8000元哦']);
}else{
$param['createtime'] = time();
$param['num'] = date('Ymd').substr(implode(NULL, array_map('ord', str_split(substr(uniqid(), 7, 13), 1))), 0, 8);
$data = Db::name('viporder')
->insertGetId($param);
if(empty($data)){
$this->error(['code'=>2,'msg'=>'sql执行失败']);
}
$this->success('SUCCESS',['order_id'=>$data]);
}
}
/**
* @ApiTitle (会员介绍)
* @ApiSummary (会员介绍)
* @ApiMethod (POST)
... ...
此 diff 太大无法显示。