diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 35172fd..d96961a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
+ <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" />
@@ -13,11 +14,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="187">
- <caret line="1894" column="36" lean-forward="true" selection-start-line="1894" selection-start-column="36" selection-end-line="1894" selection-end-column="36" />
+ <state relative-caret-position="258">
+ <caret line="738" column="7" lean-forward="true" selection-start-line="738" selection-start-column="7" selection-end-line="738" selection-end-column="7" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
@@ -50,54 +51,55 @@
<element signature="e#24565#25044#0#PHP" expanded="false" />
<element signature="e#25049#25806#0#PHP" expanded="false" />
<element signature="e#25812#26293#0#PHP" expanded="false" />
- <element signature="e#26298#27067#0#PHP" expanded="false" />
- <element signature="e#27073#27436#0#PHP" expanded="false" />
- <element signature="e#27441#27632#0#PHP" expanded="false" />
- <element signature="e#27638#27996#0#PHP" expanded="false" />
- <element signature="e#28001#28192#0#PHP" expanded="false" />
- <element signature="e#28198#29341#0#PHP" expanded="false" />
- <element signature="e#29346#32011#0#PHP" expanded="false" />
- <element signature="e#32017#32515#0#PHP" expanded="false" />
- <element signature="e#32520#34266#0#PHP" expanded="false" />
- <element signature="e#34272#34685#0#PHP" expanded="false" />
- <element signature="e#34690#35169#0#PHP" expanded="false" />
- <element signature="e#35175#35709#0#PHP" expanded="false" />
- <element signature="e#35714#37099#0#PHP" expanded="false" />
- <element signature="e#37105#37759#0#PHP" expanded="false" />
- <element signature="e#37764#39779#0#PHP" expanded="false" />
- <element signature="e#39785#40545#0#PHP" expanded="false" />
- <element signature="e#40550#43259#0#PHP" expanded="false" />
- <element signature="e#43285#44116#0#PHP" expanded="false" />
- <element signature="e#44122#44542#0#PHP" expanded="false" />
- <element signature="e#44547#45030#0#PHP" expanded="false" />
- <element signature="e#45036#45842#0#PHP" expanded="false" />
- <element signature="e#45847#49005#0#PHP" expanded="false" />
- <element signature="e#49020#50355#0#PHP" expanded="false" />
- <element signature="e#50371#51405#0#PHP" expanded="false" />
- <element signature="e#51411#52169#0#PHP" expanded="false" />
- <element signature="e#52174#55917#0#PHP" expanded="false" />
- <element signature="e#55923#56315#0#PHP" expanded="false" />
- <element signature="e#56320#57272#0#PHP" expanded="false" />
- <element signature="e#57296#57869#0#PHP" expanded="false" />
- <element signature="e#57875#58474#0#PHP" expanded="false" />
- <element signature="e#58479#59406#0#PHP" expanded="false" />
- <element signature="e#59412#60126#0#PHP" expanded="false" />
- <element signature="e#60132#60559#0#PHP" expanded="false" />
- <element signature="e#60564#61033#0#PHP" expanded="false" />
- <element signature="e#61040#62245#0#PHP" expanded="false" />
- <element signature="e#62250#63953#0#PHP" expanded="false" />
- <element signature="e#62397#62736#1#PHP" expanded="false" />
- <element signature="e#62766#63120#1#PHP" expanded="false" />
- <element signature="e#63959#64651#0#PHP" expanded="false" />
- <element signature="e#64776#64913#1#PHP" expanded="false" />
- <element signature="e#64943#65083#1#PHP" expanded="false" />
- <element signature="e#65094#65185#0#PHP" expanded="false" />
- <element signature="e#65611#65857#0#PHP" expanded="false" />
- <element signature="e#66467#66635#0#PHP" expanded="false" />
- <element signature="e#66713#67724#0#PHP" expanded="false" />
- <element signature="e#67786#68165#0#PHP" expanded="false" />
- <element signature="e#68584#69093#0#PHP" expanded="false" />
- <element signature="e#69098#69770#0#PHP" expanded="false" />
+ <element signature="e#26298#27068#0#PHP" expanded="false" />
+ <element signature="e#27074#27437#0#PHP" expanded="false" />
+ <element signature="e#27442#27633#0#PHP" expanded="false" />
+ <element signature="e#27639#27997#0#PHP" expanded="false" />
+ <element signature="e#28002#28193#0#PHP" expanded="false" />
+ <element signature="e#28199#29342#0#PHP" expanded="false" />
+ <element signature="e#29347#32012#0#PHP" expanded="false" />
+ <element signature="e#32018#32516#0#PHP" expanded="false" />
+ <element signature="e#32521#34267#0#PHP" expanded="false" />
+ <element signature="e#34273#34686#0#PHP" expanded="false" />
+ <element signature="e#34691#35170#0#PHP" expanded="false" />
+ <element signature="e#35176#35710#0#PHP" expanded="false" />
+ <element signature="e#35715#37100#0#PHP" expanded="false" />
+ <element signature="e#37106#37760#0#PHP" expanded="false" />
+ <element signature="e#37765#39780#0#PHP" expanded="false" />
+ <element signature="e#39786#40546#0#PHP" expanded="false" />
+ <element signature="e#40551#43260#0#PHP" expanded="false" />
+ <element signature="e#43286#44117#0#PHP" expanded="false" />
+ <element signature="e#44123#44543#0#PHP" expanded="false" />
+ <element signature="e#44548#45031#0#PHP" expanded="false" />
+ <element signature="e#45037#45843#0#PHP" expanded="false" />
+ <element signature="e#45848#49006#0#PHP" expanded="false" />
+ <element signature="e#49021#50356#0#PHP" expanded="false" />
+ <element signature="e#50372#51406#0#PHP" expanded="false" />
+ <element signature="e#51412#52170#0#PHP" expanded="false" />
+ <element signature="e#52175#55918#0#PHP" expanded="false" />
+ <element signature="e#55924#56316#0#PHP" expanded="false" />
+ <element signature="e#56321#57273#0#PHP" expanded="false" />
+ <element signature="e#57297#57870#0#PHP" expanded="false" />
+ <element signature="e#57876#58475#0#PHP" expanded="false" />
+ <element signature="e#58480#59407#0#PHP" expanded="false" />
+ <element signature="e#59413#60127#0#PHP" expanded="false" />
+ <element signature="e#60133#60560#0#PHP" expanded="false" />
+ <element signature="e#60565#61034#0#PHP" expanded="false" />
+ <element signature="e#61041#62246#0#PHP" expanded="false" />
+ <element signature="e#62251#63954#0#PHP" expanded="false" />
+ <element signature="e#62398#62737#1#PHP" expanded="false" />
+ <element signature="e#62767#63121#1#PHP" expanded="false" />
+ <element signature="e#63960#64652#0#PHP" expanded="false" />
+ <element signature="e#64657#68579#0#PHP" expanded="false" />
+ <element signature="e#64777#64914#1#PHP" expanded="false" />
+ <element signature="e#64944#65084#1#PHP" expanded="false" />
+ <element signature="e#65095#65186#0#PHP" expanded="false" />
+ <element signature="e#65612#65858#0#PHP" expanded="false" />
+ <element signature="e#66468#66636#0#PHP" expanded="false" />
+ <element signature="e#66714#67725#0#PHP" expanded="false" />
+ <element signature="e#67787#68166#0#PHP" expanded="false" />
+ <element signature="e#68585#69094#0#PHP" expanded="false" />
+ <element signature="e#69099#69771#0#PHP" expanded="false" />
</folding>
</state>
</provider>
@@ -106,8 +108,8 @@
<file leaf-file-name="Order.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="262">
- <caret line="49" column="29" lean-forward="true" selection-start-line="49" selection-start-column="29" selection-end-line="49" selection-end-column="29" />
+ <state relative-caret-position="287">
+ <caret line="50" column="33" lean-forward="true" selection-start-line="50" selection-start-column="33" selection-end-line="50" selection-end-column="33" />
<folding>
<element signature="e#631#922#0#PHP" expanded="false" />
<element signature="e#2005#11529#0#PHP" expanded="false" />
@@ -300,35 +302,35 @@
</provider>
</entry>
</file>
- <file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
+ <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="132">
- <caret line="96" column="29" lean-forward="true" selection-start-line="96" selection-start-column="29" selection-end-line="96" selection-end-column="29" />
+ <state relative-caret-position="219">
+ <caret line="523" column="0" lean-forward="true" selection-start-line="523" selection-start-column="0" selection-end-line="523" selection-end-column="0" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
<element signature="e#1024#3100#0#PHP" expanded="false" />
<element signature="e#3106#3426#0#PHP" expanded="false" />
+ <element signature="e#3431#5513#0#PHP" expanded="false" />
<element signature="e#5519#5937#0#PHP" expanded="false" />
<element signature="e#5942#16057#0#PHP" expanded="false" />
<element signature="e#7800#9209#0#PHP" expanded="false" />
<element signature="e#9238#13176#0#PHP" expanded="false" />
- <element signature="e#14215#15990#0#PHP" expanded="false" />
<element signature="e#16063#16483#0#PHP" expanded="false" />
<element signature="e#16488#26512#0#PHP" expanded="false" />
<element signature="e#26529#26826#0#PHP" expanded="false" />
<element signature="e#26831#27224#0#PHP" expanded="false" />
<element signature="e#27251#30729#0#PHP" expanded="false" />
- <element signature="e#30758#33662#0#PHP" expanded="false" />
- <element signature="e#33695#39647#0#PHP" expanded="false" />
- <element signature="e#34494#35486#0#PHP" expanded="false" />
- <element signature="e#35532#39037#0#PHP" expanded="false" />
- <element signature="e#37611#37998#0#PHP" expanded="false" />
- <element signature="e#38059#39015#0#PHP" expanded="false" />
- <element signature="e#39085#39187#0#PHP" expanded="false" />
- <element signature="e#39676#46848#0#PHP" expanded="false" />
- <element signature="e#46871#47088#0#PHP" expanded="false" />
+ <element signature="e#30758#33663#0#PHP" expanded="false" />
+ <element signature="e#33696#39648#0#PHP" expanded="false" />
+ <element signature="e#34495#35487#0#PHP" expanded="false" />
+ <element signature="e#35533#39038#0#PHP" expanded="false" />
+ <element signature="e#37612#37999#0#PHP" expanded="false" />
+ <element signature="e#38060#39016#0#PHP" expanded="false" />
+ <element signature="e#39086#39188#0#PHP" expanded="false" />
+ <element signature="e#39677#46849#0#PHP" expanded="false" />
+ <element signature="e#46872#47089#0#PHP" expanded="false" />
</folding>
</state>
</provider>
@@ -410,10 +412,10 @@
<option value="$PROJECT_DIR$/application/admin/view/suggest/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/suggest.js" />
<option value="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
- <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/api/controller/Common.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
+ <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
</list>
</option>
</component>
@@ -431,11 +433,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
- <component name="ProjectFrameBounds">
- <option name="x" value="383" />
- <option name="y" value="50" />
+ <component name="ProjectFrameBounds" extendedState="7">
+ <option name="x" value="206" />
+ <option name="y" value="56" />
<option name="width" value="1569" />
- <option name="height" value="924" />
+ <option name="height" value="923" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
@@ -580,7 +582,7 @@
<workItem from="1576028218954" duration="680000" />
<workItem from="1576128183316" duration="7364000" />
<workItem from="1576135696788" duration="17540000" />
- <workItem from="1576153922472" duration="3621000" />
+ <workItem from="1576153922472" duration="4398000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
@@ -607,7 +609,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="418759000" />
+ <option name="totallyTimeSpent" value="419536000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -619,10 +621,10 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="383" y="50" width="1569" height="924" 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.17958914" 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.1444563" 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" />
@@ -1212,42 +1214,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="132">
- <caret line="96" column="29" lean-forward="true" selection-start-line="96" selection-start-column="29" selection-end-line="96" selection-end-column="29" />
- <folding>
- <element signature="e#581#700#0#PHP" expanded="false" />
- <element signature="e#706#1019#0#PHP" expanded="false" />
- <element signature="e#1024#3100#0#PHP" expanded="false" />
- <element signature="e#3106#3426#0#PHP" expanded="false" />
- <element signature="e#5519#5937#0#PHP" expanded="false" />
- <element signature="e#5942#16057#0#PHP" expanded="false" />
- <element signature="e#7800#9209#0#PHP" expanded="false" />
- <element signature="e#9238#13176#0#PHP" expanded="false" />
- <element signature="e#14215#15990#0#PHP" expanded="false" />
- <element signature="e#16063#16483#0#PHP" expanded="false" />
- <element signature="e#16488#26512#0#PHP" expanded="false" />
- <element signature="e#26529#26826#0#PHP" expanded="false" />
- <element signature="e#26831#27224#0#PHP" expanded="false" />
- <element signature="e#27251#30729#0#PHP" expanded="false" />
- <element signature="e#30758#33662#0#PHP" expanded="false" />
- <element signature="e#33695#39647#0#PHP" expanded="false" />
- <element signature="e#34494#35486#0#PHP" expanded="false" />
- <element signature="e#35532#39037#0#PHP" expanded="false" />
- <element signature="e#37611#37998#0#PHP" expanded="false" />
- <element signature="e#38059#39015#0#PHP" expanded="false" />
- <element signature="e#39085#39187#0#PHP" expanded="false" />
- <element signature="e#39676#46848#0#PHP" expanded="false" />
- <element signature="e#46871#47088#0#PHP" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="262">
- <caret line="49" column="29" lean-forward="true" selection-start-line="49" selection-start-column="29" selection-end-line="49" selection-end-column="29" />
+ <state relative-caret-position="287">
+ <caret line="50" column="33" lean-forward="true" selection-start-line="50" selection-start-column="33" selection-end-line="50" selection-end-column="33" />
<folding>
<element signature="e#631#922#0#PHP" expanded="false" />
<element signature="e#2005#11529#0#PHP" expanded="false" />
@@ -1441,8 +1411,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="187">
- <caret line="1894" column="36" lean-forward="true" selection-start-line="1894" selection-start-column="36" selection-end-line="1894" selection-end-column="36" />
+ <state relative-caret-position="258">
+ <caret line="738" column="7" lean-forward="true" selection-start-line="738" selection-start-column="7" selection-end-line="738" selection-end-column="7" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
@@ -1475,54 +1445,87 @@
<element signature="e#24565#25044#0#PHP" expanded="false" />
<element signature="e#25049#25806#0#PHP" expanded="false" />
<element signature="e#25812#26293#0#PHP" expanded="false" />
- <element signature="e#26298#27067#0#PHP" expanded="false" />
- <element signature="e#27073#27436#0#PHP" expanded="false" />
- <element signature="e#27441#27632#0#PHP" expanded="false" />
- <element signature="e#27638#27996#0#PHP" expanded="false" />
- <element signature="e#28001#28192#0#PHP" expanded="false" />
- <element signature="e#28198#29341#0#PHP" expanded="false" />
- <element signature="e#29346#32011#0#PHP" expanded="false" />
- <element signature="e#32017#32515#0#PHP" expanded="false" />
- <element signature="e#32520#34266#0#PHP" expanded="false" />
- <element signature="e#34272#34685#0#PHP" expanded="false" />
- <element signature="e#34690#35169#0#PHP" expanded="false" />
- <element signature="e#35175#35709#0#PHP" expanded="false" />
- <element signature="e#35714#37099#0#PHP" expanded="false" />
- <element signature="e#37105#37759#0#PHP" expanded="false" />
- <element signature="e#37764#39779#0#PHP" expanded="false" />
- <element signature="e#39785#40545#0#PHP" expanded="false" />
- <element signature="e#40550#43259#0#PHP" expanded="false" />
- <element signature="e#43285#44116#0#PHP" expanded="false" />
- <element signature="e#44122#44542#0#PHP" expanded="false" />
- <element signature="e#44547#45030#0#PHP" expanded="false" />
- <element signature="e#45036#45842#0#PHP" expanded="false" />
- <element signature="e#45847#49005#0#PHP" expanded="false" />
- <element signature="e#49020#50355#0#PHP" expanded="false" />
- <element signature="e#50371#51405#0#PHP" expanded="false" />
- <element signature="e#51411#52169#0#PHP" expanded="false" />
- <element signature="e#52174#55917#0#PHP" expanded="false" />
- <element signature="e#55923#56315#0#PHP" expanded="false" />
- <element signature="e#56320#57272#0#PHP" expanded="false" />
- <element signature="e#57296#57869#0#PHP" expanded="false" />
- <element signature="e#57875#58474#0#PHP" expanded="false" />
- <element signature="e#58479#59406#0#PHP" expanded="false" />
- <element signature="e#59412#60126#0#PHP" expanded="false" />
- <element signature="e#60132#60559#0#PHP" expanded="false" />
- <element signature="e#60564#61033#0#PHP" expanded="false" />
- <element signature="e#61040#62245#0#PHP" expanded="false" />
- <element signature="e#62250#63953#0#PHP" expanded="false" />
- <element signature="e#62397#62736#1#PHP" expanded="false" />
- <element signature="e#62766#63120#1#PHP" expanded="false" />
- <element signature="e#63959#64651#0#PHP" expanded="false" />
- <element signature="e#64776#64913#1#PHP" expanded="false" />
- <element signature="e#64943#65083#1#PHP" expanded="false" />
- <element signature="e#65094#65185#0#PHP" expanded="false" />
- <element signature="e#65611#65857#0#PHP" expanded="false" />
- <element signature="e#66467#66635#0#PHP" expanded="false" />
- <element signature="e#66713#67724#0#PHP" expanded="false" />
- <element signature="e#67786#68165#0#PHP" expanded="false" />
- <element signature="e#68584#69093#0#PHP" expanded="false" />
- <element signature="e#69098#69770#0#PHP" expanded="false" />
+ <element signature="e#26298#27068#0#PHP" expanded="false" />
+ <element signature="e#27074#27437#0#PHP" expanded="false" />
+ <element signature="e#27442#27633#0#PHP" expanded="false" />
+ <element signature="e#27639#27997#0#PHP" expanded="false" />
+ <element signature="e#28002#28193#0#PHP" expanded="false" />
+ <element signature="e#28199#29342#0#PHP" expanded="false" />
+ <element signature="e#29347#32012#0#PHP" expanded="false" />
+ <element signature="e#32018#32516#0#PHP" expanded="false" />
+ <element signature="e#32521#34267#0#PHP" expanded="false" />
+ <element signature="e#34273#34686#0#PHP" expanded="false" />
+ <element signature="e#34691#35170#0#PHP" expanded="false" />
+ <element signature="e#35176#35710#0#PHP" expanded="false" />
+ <element signature="e#35715#37100#0#PHP" expanded="false" />
+ <element signature="e#37106#37760#0#PHP" expanded="false" />
+ <element signature="e#37765#39780#0#PHP" expanded="false" />
+ <element signature="e#39786#40546#0#PHP" expanded="false" />
+ <element signature="e#40551#43260#0#PHP" expanded="false" />
+ <element signature="e#43286#44117#0#PHP" expanded="false" />
+ <element signature="e#44123#44543#0#PHP" expanded="false" />
+ <element signature="e#44548#45031#0#PHP" expanded="false" />
+ <element signature="e#45037#45843#0#PHP" expanded="false" />
+ <element signature="e#45848#49006#0#PHP" expanded="false" />
+ <element signature="e#49021#50356#0#PHP" expanded="false" />
+ <element signature="e#50372#51406#0#PHP" expanded="false" />
+ <element signature="e#51412#52170#0#PHP" expanded="false" />
+ <element signature="e#52175#55918#0#PHP" expanded="false" />
+ <element signature="e#55924#56316#0#PHP" expanded="false" />
+ <element signature="e#56321#57273#0#PHP" expanded="false" />
+ <element signature="e#57297#57870#0#PHP" expanded="false" />
+ <element signature="e#57876#58475#0#PHP" expanded="false" />
+ <element signature="e#58480#59407#0#PHP" expanded="false" />
+ <element signature="e#59413#60127#0#PHP" expanded="false" />
+ <element signature="e#60133#60560#0#PHP" expanded="false" />
+ <element signature="e#60565#61034#0#PHP" expanded="false" />
+ <element signature="e#61041#62246#0#PHP" expanded="false" />
+ <element signature="e#62251#63954#0#PHP" expanded="false" />
+ <element signature="e#62398#62737#1#PHP" expanded="false" />
+ <element signature="e#62767#63121#1#PHP" expanded="false" />
+ <element signature="e#63960#64652#0#PHP" expanded="false" />
+ <element signature="e#64657#68579#0#PHP" expanded="false" />
+ <element signature="e#64777#64914#1#PHP" expanded="false" />
+ <element signature="e#64944#65084#1#PHP" expanded="false" />
+ <element signature="e#65095#65186#0#PHP" expanded="false" />
+ <element signature="e#65612#65858#0#PHP" expanded="false" />
+ <element signature="e#66468#66636#0#PHP" expanded="false" />
+ <element signature="e#66714#67725#0#PHP" expanded="false" />
+ <element signature="e#67787#68166#0#PHP" expanded="false" />
+ <element signature="e#68585#69094#0#PHP" expanded="false" />
+ <element signature="e#69099#69771#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="219">
+ <caret line="523" column="0" lean-forward="true" selection-start-line="523" selection-start-column="0" selection-end-line="523" selection-end-column="0" />
+ <folding>
+ <element signature="e#581#700#0#PHP" expanded="false" />
+ <element signature="e#706#1019#0#PHP" expanded="false" />
+ <element signature="e#1024#3100#0#PHP" expanded="false" />
+ <element signature="e#3106#3426#0#PHP" expanded="false" />
+ <element signature="e#3431#5513#0#PHP" expanded="false" />
+ <element signature="e#5519#5937#0#PHP" expanded="false" />
+ <element signature="e#5942#16057#0#PHP" expanded="false" />
+ <element signature="e#7800#9209#0#PHP" expanded="false" />
+ <element signature="e#9238#13176#0#PHP" expanded="false" />
+ <element signature="e#16063#16483#0#PHP" expanded="false" />
+ <element signature="e#16488#26512#0#PHP" expanded="false" />
+ <element signature="e#26529#26826#0#PHP" expanded="false" />
+ <element signature="e#26831#27224#0#PHP" expanded="false" />
+ <element signature="e#27251#30729#0#PHP" expanded="false" />
+ <element signature="e#30758#33663#0#PHP" expanded="false" />
+ <element signature="e#33696#39648#0#PHP" expanded="false" />
+ <element signature="e#34495#35487#0#PHP" expanded="false" />
+ <element signature="e#35533#39038#0#PHP" expanded="false" />
+ <element signature="e#37612#37999#0#PHP" expanded="false" />
+ <element signature="e#38060#39016#0#PHP" expanded="false" />
+ <element signature="e#39086#39188#0#PHP" expanded="false" />
+ <element signature="e#39677#46849#0#PHP" expanded="false" />
+ <element signature="e#46872#47089#0#PHP" expanded="false" />
</folding>
</state>
</provider>
diff --git a/application/api/controller/Pay.php b/application/api/controller/Pay.php
index 35e0d18..c0434cb 100644
--- a/application/api/controller/Pay.php
+++ b/application/api/controller/Pay.php
@@ -113,7 +113,7 @@ class Pay extends Api
$result = $app->order->unify([
'body' => '山东航拍',
'out_trade_no' => $data['num'],//支付订单号
- 'total_fee' => $data['money']*100,//单位分
+ 'total_fee' => $data['total']*100,//单位分
'notify_url' => 'https://areial.w.broing.cn/api/pay/vippayOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
'openid' => $openid['openid'],
@@ -641,7 +641,7 @@ class Pay extends Api
Db::startTrans();
try{
//判断用户充值金额是否大于等于8000
- if($data['money']>=0.8){
+ if($data['money']>=8000){
//大于等于的情况
$res = Db::name('viporder')->where('num',$message['out_trade_no'])->update($toporder);
$arr = Db::name('user')->where('id',$data['user_id'])->find();
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 6366602..61e90c4 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -782,7 +782,7 @@ class User extends Api
$param['total'] = $this->request->post('total');
if(empty( $param['total'])){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
- }elseif ( $param['total']<=0.8){
+ }elseif ( $param['total']<=8000){
$this->error(['code'=>3,'msg'=>'开通会员至少需要8000元哦']);
}else{
$param['createtime'] = time();