From 79cb1c6b79029ba2cb6bfc830afcc81794b8a6f8 Mon Sep 17 00:00:00 2001
From: guosheng <gs@bronet.cn>
Date: Thu, 28 Nov 2019 11:11:15 +0800
Subject: [PATCH] 修改下订单
---
.idea/workspace.xml | 340 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------
application/api/controller/Pay.php | 11 +++++++----
application/api/controller/User.php | 4 ++--
3 files changed, 241 insertions(+), 114 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c13c9de..abf274c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,9 @@
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@@ -13,41 +15,115 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
+ <file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
<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="545" column="40" lean-forward="false" selection-start-line="545" selection-start-column="40" selection-end-line="545" selection-end-column="40" />
+ <state relative-caret-position="219">
+ <caret line="153" column="29" lean-forward="false" selection-start-line="153" selection-start-column="29" selection-end-line="153" selection-end-column="29" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#574#693#0#PHP" expanded="false" />
<element signature="e#699#1012#0#PHP" expanded="false" />
- <element signature="e#1017#3092#0#PHP" expanded="false" />
- <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#13236#13656#0#PHP" expanded="false" />
- <element signature="e#13661#20957#0#PHP" expanded="false" />
- <element signature="e#15295#15583#0#PHP" expanded="false" />
- <element signature="e#15659#15932#0#PHP" expanded="false" />
- <element signature="e#16087#16397#0#PHP" expanded="false" />
- <element signature="e#16472#16923#0#PHP" expanded="false" />
- <element signature="e#17000#18044#0#PHP" expanded="false" />
- <element signature="e#18138#18256#0#PHP" expanded="false" />
- <element signature="e#20974#21271#0#PHP" expanded="false" />
- <element signature="e#21276#21669#0#PHP" expanded="false" />
- <element signature="e#21696#25174#0#PHP" expanded="false" />
- <element signature="e#25203#28108#0#PHP" expanded="false" />
- <element signature="e#28137#31587#0#PHP" expanded="false" />
- <element signature="e#29013#29618#0#PHP" expanded="false" />
- <element signature="e#29639#31076#0#PHP" expanded="false" />
- <element signature="e#31124#31226#0#PHP" expanded="false" />
- <element signature="e#31616#35353#0#PHP" expanded="false" />
- <element signature="e#35376#35593#0#PHP" expanded="false" />
+ <element signature="e#1017#3093#0#PHP" expanded="false" />
+ <element signature="e#3099#3419#0#PHP" expanded="false" />
+ <element signature="e#3424#5506#0#PHP" expanded="false" />
+ <element signature="e#5512#5930#0#PHP" expanded="false" />
+ <element signature="e#5935#13303#0#PHP" expanded="false" />
+ <element signature="e#6179#6269#0#PHP" expanded="false" />
+ <element signature="e#6347#6443#0#PHP" expanded="false" />
+ <element signature="e#7641#7929#0#PHP" expanded="false" />
+ <element signature="e#8006#8279#0#PHP" expanded="false" />
+ <element signature="e#13309#13729#0#PHP" expanded="false" />
+ <element signature="e#13734#21031#0#PHP" expanded="false" />
+ <element signature="e#15368#15656#0#PHP" expanded="false" />
+ <element signature="e#15732#16005#0#PHP" expanded="false" />
+ <element signature="e#16160#16470#0#PHP" expanded="false" />
+ <element signature="e#16545#16996#0#PHP" expanded="false" />
+ <element signature="e#17073#18117#0#PHP" expanded="false" />
+ <element signature="e#18211#18329#0#PHP" expanded="false" />
+ <element signature="e#21048#21345#0#PHP" expanded="false" />
+ <element signature="e#21350#21743#0#PHP" expanded="false" />
+ <element signature="e#21770#25248#0#PHP" expanded="false" />
+ <element signature="e#25277#28182#0#PHP" expanded="false" />
+ <element signature="e#28211#31661#0#PHP" expanded="false" />
+ <element signature="e#29087#29692#0#PHP" expanded="false" />
+ <element signature="e#29713#31150#0#PHP" expanded="false" />
+ <element signature="e#31198#31300#0#PHP" expanded="false" />
+ <element signature="e#31690#35427#0#PHP" expanded="false" />
+ <element signature="e#35450#35667#0#PHP" expanded="false" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="182">
+ <caret line="1118" column="29" lean-forward="true" selection-start-line="1118" selection-start-column="29" selection-end-line="1118" selection-end-column="29" />
+ <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#36821#37283#0#PHP" expanded="false" />
+ <element signature="e#37804#38564#0#PHP" expanded="false" />
+ <element signature="e#38569#41278#0#PHP" expanded="false" />
+ <element signature="e#41304#42135#0#PHP" expanded="false" />
+ <element signature="e#42141#42561#0#PHP" expanded="false" />
+ <element signature="e#42566#43049#0#PHP" expanded="false" />
+ <element signature="e#43055#43861#0#PHP" expanded="false" />
+ <element signature="e#43866#47020#0#PHP" expanded="false" />
+ <element signature="e#47035#48363#0#PHP" expanded="false" />
+ <element signature="e#48379#49406#0#PHP" expanded="false" />
+ <element signature="e#49412#50170#0#PHP" expanded="false" />
+ <element signature="e#50175#53918#0#PHP" expanded="false" />
+ <element signature="e#53924#54316#0#PHP" expanded="false" />
+ <element signature="e#54321#55273#0#PHP" expanded="false" />
+ <element signature="e#55297#55870#0#PHP" expanded="false" />
+ <element signature="e#55876#56475#0#PHP" expanded="false" />
+ <element signature="e#56480#57407#0#PHP" expanded="false" />
+ <element signature="e#57413#58127#0#PHP" expanded="false" />
+ <element signature="e#58133#58560#0#PHP" expanded="false" />
+ <element signature="e#58565#59034#0#PHP" expanded="false" />
</folding>
</state>
</provider>
@@ -119,9 +195,9 @@
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/vip.php" />
<option value="$PROJECT_DIR$/application/admin/view/vip/edit.html" />
<option value="$USER_HOME$/Desktop/1.html" />
- <option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/nsms/nsms.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
+ <option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
@@ -140,9 +216,9 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
- <option name="x" value="320" />
- <option name="y" value="82" />
- <option name="width" value="1399" />
+ <option name="x" value="148" />
+ <option name="y" value="79" />
+ <option name="width" value="1696" />
<option name="height" value="945" />
</component>
<component name="ProjectView">
@@ -160,8 +236,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scratches" />
<pane id="Scope" />
+ <pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -174,30 +250,6 @@
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
- <path>
- <item name="areial" type="b2602c69:ProjectViewProjectNode" />
- <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
- </path>
- <path>
- <item name="areial" type="b2602c69:ProjectViewProjectNode" />
- <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
- </path>
- <path>
- <item name="areial" type="b2602c69:ProjectViewProjectNode" />
- <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="nsms" type="2a2b976b:PhpTreeStructureProvider$1" />
- </path>
- <path>
- <item name="areial" type="b2602c69:ProjectViewProjectNode" />
- <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="extend" type="2a2b976b:PhpTreeStructureProvider$1" />
- </path>
</expand>
<select />
</subPane>
@@ -206,7 +258,7 @@
</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$" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
@@ -264,7 +316,10 @@
<workItem from="1574814989178" duration="1007000" />
<workItem from="1574831367903" duration="17171000" />
<workItem from="1574849431656" duration="8641000" />
- <workItem from="1574900416229" duration="2167000" />
+ <workItem from="1574900416229" duration="2857000" />
+ <workItem from="1574904867625" duration="793000" />
+ <workItem from="1574908494078" duration="8000" />
+ <workItem from="1574908927190" duration="1671000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
@@ -277,7 +332,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="281636000" />
+ <option name="totallyTimeSpent" value="284798000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -289,18 +344,18 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="320" y="82" width="1399" height="945" extended-state="1" />
+ <frame x="148" y="79" width="1696" height="945" 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.1926811" 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.16503668" 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="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="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.11881188" 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="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="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" />
<window_info id="Message" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -341,7 +396,7 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
- <option name="time" value="11" />
+ <option name="time" value="12" />
</breakpoint-manager>
<watches-manager />
</component>
@@ -530,6 +585,7 @@
<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>
@@ -572,6 +628,7 @@
<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>
@@ -631,20 +688,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
- <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" />
- </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="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" />
- </state>
- </provider>
- </entry>
<entry file="file://$USER_HOME$/Desktop/助通短信平台账号/php_Nsms_demo.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1200">
@@ -677,43 +720,124 @@
<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/extra/verify.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="500">
+ <caret line="20" column="17" lean-forward="true" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+ <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="444">
- <caret line="545" column="40" lean-forward="false" selection-start-line="545" selection-start-column="40" selection-end-line="545" selection-end-column="40" />
+ <state relative-caret-position="219">
+ <caret line="153" column="29" lean-forward="false" selection-start-line="153" selection-start-column="29" selection-end-line="153" selection-end-column="29" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#574#693#0#PHP" expanded="false" />
<element signature="e#699#1012#0#PHP" expanded="false" />
- <element signature="e#1017#3092#0#PHP" expanded="false" />
- <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#13236#13656#0#PHP" expanded="false" />
- <element signature="e#13661#20957#0#PHP" expanded="false" />
- <element signature="e#15295#15583#0#PHP" expanded="false" />
- <element signature="e#15659#15932#0#PHP" expanded="false" />
- <element signature="e#16087#16397#0#PHP" expanded="false" />
- <element signature="e#16472#16923#0#PHP" expanded="false" />
- <element signature="e#17000#18044#0#PHP" expanded="false" />
- <element signature="e#18138#18256#0#PHP" expanded="false" />
- <element signature="e#20974#21271#0#PHP" expanded="false" />
- <element signature="e#21276#21669#0#PHP" expanded="false" />
- <element signature="e#21696#25174#0#PHP" expanded="false" />
- <element signature="e#25203#28108#0#PHP" expanded="false" />
- <element signature="e#28137#31587#0#PHP" expanded="false" />
- <element signature="e#29013#29618#0#PHP" expanded="false" />
- <element signature="e#29639#31076#0#PHP" expanded="false" />
- <element signature="e#31124#31226#0#PHP" expanded="false" />
- <element signature="e#31616#35353#0#PHP" expanded="false" />
- <element signature="e#35376#35593#0#PHP" expanded="false" />
+ <element signature="e#1017#3093#0#PHP" expanded="false" />
+ <element signature="e#3099#3419#0#PHP" expanded="false" />
+ <element signature="e#3424#5506#0#PHP" expanded="false" />
+ <element signature="e#5512#5930#0#PHP" expanded="false" />
+ <element signature="e#5935#13303#0#PHP" expanded="false" />
+ <element signature="e#6179#6269#0#PHP" expanded="false" />
+ <element signature="e#6347#6443#0#PHP" expanded="false" />
+ <element signature="e#7641#7929#0#PHP" expanded="false" />
+ <element signature="e#8006#8279#0#PHP" expanded="false" />
+ <element signature="e#13309#13729#0#PHP" expanded="false" />
+ <element signature="e#13734#21031#0#PHP" expanded="false" />
+ <element signature="e#15368#15656#0#PHP" expanded="false" />
+ <element signature="e#15732#16005#0#PHP" expanded="false" />
+ <element signature="e#16160#16470#0#PHP" expanded="false" />
+ <element signature="e#16545#16996#0#PHP" expanded="false" />
+ <element signature="e#17073#18117#0#PHP" expanded="false" />
+ <element signature="e#18211#18329#0#PHP" expanded="false" />
+ <element signature="e#21048#21345#0#PHP" expanded="false" />
+ <element signature="e#21350#21743#0#PHP" expanded="false" />
+ <element signature="e#21770#25248#0#PHP" expanded="false" />
+ <element signature="e#25277#28182#0#PHP" expanded="false" />
+ <element signature="e#28211#31661#0#PHP" expanded="false" />
+ <element signature="e#29087#29692#0#PHP" expanded="false" />
+ <element signature="e#29713#31150#0#PHP" expanded="false" />
+ <element signature="e#31198#31300#0#PHP" expanded="false" />
+ <element signature="e#31690#35427#0#PHP" expanded="false" />
+ <element signature="e#35450#35667#0#PHP" expanded="false" />
+ </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="182">
+ <caret line="1118" column="29" lean-forward="true" selection-start-line="1118" selection-start-column="29" selection-end-line="1118" selection-end-column="29" />
+ <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#36821#37283#0#PHP" expanded="false" />
+ <element signature="e#37804#38564#0#PHP" expanded="false" />
+ <element signature="e#38569#41278#0#PHP" expanded="false" />
+ <element signature="e#41304#42135#0#PHP" expanded="false" />
+ <element signature="e#42141#42561#0#PHP" expanded="false" />
+ <element signature="e#42566#43049#0#PHP" expanded="false" />
+ <element signature="e#43055#43861#0#PHP" expanded="false" />
+ <element signature="e#43866#47020#0#PHP" expanded="false" />
+ <element signature="e#47035#48363#0#PHP" expanded="false" />
+ <element signature="e#48379#49406#0#PHP" expanded="false" />
+ <element signature="e#49412#50170#0#PHP" expanded="false" />
+ <element signature="e#50175#53918#0#PHP" expanded="false" />
+ <element signature="e#53924#54316#0#PHP" expanded="false" />
+ <element signature="e#54321#55273#0#PHP" expanded="false" />
+ <element signature="e#55297#55870#0#PHP" expanded="false" />
+ <element signature="e#55876#56475#0#PHP" expanded="false" />
+ <element signature="e#56480#57407#0#PHP" expanded="false" />
+ <element signature="e#57413#58127#0#PHP" expanded="false" />
+ <element signature="e#58133#58560#0#PHP" expanded="false" />
+ <element signature="e#58565#59034#0#PHP" expanded="false" />
</folding>
</state>
</provider>
diff --git a/application/api/controller/Pay.php b/application/api/controller/Pay.php
index 09c6f02..75da878 100644
--- a/application/api/controller/Pay.php
+++ b/application/api/controller/Pay.php
@@ -58,7 +58,7 @@ class Pay extends Api
'body' => '山东航拍',
'out_trade_no' => $data['num'],//支付订单号
'total_fee' => $data['money']*100,//单位分
- 'notify_url' => 'http://areial.w.brotop.cn/api/pay/payOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
+ 'notify_url' => 'https://areial.w.broing.cn/api/pay/payOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
'openid' => $openid['openid'],
]);
@@ -114,7 +114,7 @@ class Pay extends Api
'body' => '山东航拍',
'out_trade_no' => $data['num'],//支付订单号
'total_fee' => $data['money']*100,//单位分
- 'notify_url' => 'http://areial.w.brotop.cn/api/pay/vippayOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
+ 'notify_url' => 'https://areial.w.broing.cn/api/pay/vippayOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
'openid' => $openid['openid'],
]);
@@ -156,10 +156,12 @@ class Pay extends Api
if($this->request->isPost()){
$order_id = $this->request->post('order_id');
$type = $this->request->post('type');
+ //判断付费类型
if(empty($type)){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$openid = $this->getopenid();
+ //判断openid
if(empty($openid)){
$this->error(['code'=>2,'msg'=>'openid不能为空']);
}
@@ -167,6 +169,7 @@ class Pay extends Api
$pic_id = explode(',',$data['pic_id']);
$video_id = unserialize($data['video_id']);
+ //查询用户表 取出手机号
$user = Db::name('user')->where('id',$data['user_id'])->find();
$mobile = $user['mobile'];
$str = "【仁甲看见】";
@@ -266,7 +269,7 @@ class Pay extends Api
'body' => '山东航拍',
'out_trade_no' => $data['num'],//支付订单号
'total_fee' => $data['total']*100,//单位分
- 'notify_url' => 'http://areial.w.brotop.cn/api/pay/picOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
+ 'notify_url' => 'https://areial.w.broing.cn/api/pay/picOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
'openid' => $openid['openid'],
]);
@@ -415,7 +418,7 @@ class Pay extends Api
'body' => '山东航拍',
'out_trade_no' => $data['num'],//支付订单号
'total_fee' => $data['total']*100,//单位分
- 'notify_url' => 'http://areial.w.brotop.cn/api/pay/videoOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
+ 'notify_url' => 'https://areial.w.broing.cn/api/pay/videoOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
'openid' => $openid['openid'],
]);
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 5cf2b50..6deb181 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -1106,7 +1106,7 @@ class User extends Api
if(!empty($v['video_id'])){
foreach ($v['video_id'] as $v1){
if($v1['id'] == $video_id && $v1['attr'] == $video_attr){
- $this->error(['code'=>2,'msg'=>'该属性的视频已经购买过了','video_id'=>$v1['id']]);
+ $this->error(['code'=>2,'msg'=>'该属性的视频已经购买过了','video_id'=>$v1['id'],'attr'=>$v1['attr']]);
}
}
}
@@ -1119,7 +1119,7 @@ class User extends Api
if(empty($data)){
$this->error(['code'=>2,'msg'=>'sql执行失败']);
}
- $this->success('SUCCESS',['order_id'=>$data]);
+ $this->success('SUCCESS',['order_id'=>$data,'video_id'=>$video_id,'attr'=>$video_attr]);
}
}
--
libgit2 0.24.0