From 3b28370c37e58115a388d6af2eaa12ec109338b8 Mon Sep 17 00:00:00 2001 From: guosheng <gs@bronet.cn> Date: Tue, 10 Dec 2019 21:57:43 +0800 Subject: [PATCH] 修改充值会员 --- .idea/workspace.xml | 286 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------- application/api/controller/Pay.php | 2 +- application/api/controller/User.php | 2 +- 3 files changed, 159 insertions(+), 131 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8d8872d..d2b11da 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="134"> - <caret line="599" column="33" lean-forward="false" selection-start-line="599" selection-start-column="33" selection-end-line="599" selection-end-column="33" /> + <state relative-caret-position="157"> + <caret line="778" column="30" lean-forward="false" selection-start-line="778" selection-start-column="30" selection-end-line="778" selection-end-column="30" /> <folding> <element signature="e#365#484#0#PHP" expanded="false" /> <element signature="e#490#1228#0#PHP" expanded="false" /> @@ -50,49 +51,77 @@ <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#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#64826#0#PHP" expanded="false" /> - <element signature="e#64831#67366#0#PHP" expanded="false" /> - <element signature="e#65026#65163#1#PHP" expanded="false" /> - <element signature="e#65193#65333#1#PHP" expanded="false" /> - <element signature="e#66003#66087#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#64825#0#PHP" expanded="false" /> + <element signature="e#64830#67365#0#PHP" expanded="false" /> + <element signature="e#65025#65162#1#PHP" expanded="false" /> + <element signature="e#65192#65332#1#PHP" expanded="false" /> + <element signature="e#66002#66086#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="709"> + <caret line="643" column="48" lean-forward="true" selection-start-line="643" selection-start-column="48" selection-end-line="643" selection-end-column="48" /> + <folding> + <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#16036#0#PHP" expanded="false" /> + <element signature="e#16042#16462#0#PHP" expanded="false" /> + <element signature="e#16467#26491#0#PHP" expanded="false" /> + <element signature="e#26508#26805#0#PHP" expanded="false" /> + <element signature="e#26810#27203#0#PHP" expanded="false" /> + <element signature="e#27230#30708#0#PHP" expanded="false" /> + <element signature="e#33674#39605#0#PHP" expanded="false" /> + <element signature="e#35490#38995#0#PHP" expanded="false" /> + <element signature="e#37569#37956#0#PHP" expanded="false" /> + <element signature="e#38017#38973#0#PHP" expanded="false" /> + <element signature="e#39634#46806#0#PHP" expanded="false" /> + <element signature="e#46829#47046#0#PHP" expanded="false" /> </folding> </state> </provider> @@ -157,7 +186,6 @@ <option value="$PROJECT_DIR$/application/admin/view/accredit/index.html" /> <option value="$PROJECT_DIR$/public/assets/js/backend/accredit.js" /> <option value="$PROJECT_DIR$/application/admin/view/order/fapiao.html" /> - <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> <option value="$PROJECT_DIR$/vendor/tecnickcom/tcpdf/examples/example_002.php" /> <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" /> <option value="$PROJECT_DIR$/application/admin/view/order/shou.html" /> @@ -178,6 +206,7 @@ <option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" /> <option value="$PROJECT_DIR$/application/admin/view/common/menu.html" /> <option value="$PROJECT_DIR$/application/api/controller/User.php" /> + <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> </list> </option> </component> @@ -195,11 +224,11 @@ <sorting>DEFINITION_ORDER</sorting> </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> - <component name="ProjectFrameBounds" extendedState="1"> - <option name="x" value="362" /> - <option name="y" value="107" /> - <option name="width" value="1464" /> - <option name="height" value="940" /> + <component name="ProjectFrameBounds" extendedState="7"> + <option name="x" value="243" /> + <option name="y" value="48" /> + <option name="width" value="1569" /> + <option name="height" value="985" /> </component> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="" version="1"> @@ -340,7 +369,7 @@ <workItem from="1575937244447" duration="6285000" /> <workItem from="1575949803768" duration="5926000" /> <workItem from="1575959458925" duration="956000" /> - <workItem from="1575979358020" duration="656000" /> + <workItem from="1575979358020" duration="1473000" /> </task> <task id="LOCAL-00001" summary="调试"> <created>1574145133364</created> @@ -367,7 +396,7 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="387621000" /> + <option name="totallyTimeSpent" value="388438000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -379,17 +408,17 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="362" y="107" width="1464" height="940" extended-state="1" /> + <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.23504274" 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.17590618" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3599004" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3599004" 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" /> @@ -565,33 +594,6 @@ </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="781"> - <caret line="623" column="22" lean-forward="true" selection-start-line="623" selection-start-column="22" selection-end-line="623" selection-end-column="22" /> - <folding> - <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#16036#0#PHP" expanded="false" /> - <element signature="e#16042#16462#0#PHP" expanded="false" /> - <element signature="e#16467#26491#0#PHP" expanded="false" /> - <element signature="e#26508#26805#0#PHP" expanded="false" /> - <element signature="e#26810#27203#0#PHP" expanded="false" /> - <element signature="e#27230#30708#0#PHP" expanded="false" /> - <element signature="e#30737#33642#0#PHP" expanded="false" /> - <element signature="e#33675#39606#0#PHP" expanded="false" /> - <element signature="e#35491#38996#0#PHP" expanded="false" /> - <element signature="e#37570#37957#0#PHP" expanded="false" /> - <element signature="e#38018#38974#0#PHP" expanded="false" /> - <element signature="e#39635#46807#0#PHP" expanded="false" /> - <element signature="e#46830#47047#0#PHP" expanded="false" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/order.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="175"> @@ -1004,8 +1006,8 @@ </entry> <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="134"> - <caret line="599" column="33" lean-forward="false" selection-start-line="599" selection-start-column="33" selection-end-line="599" selection-end-column="33" /> + <state relative-caret-position="157"> + <caret line="778" column="30" lean-forward="false" selection-start-line="778" selection-start-column="30" selection-end-line="778" selection-end-column="30" /> <folding> <element signature="e#365#484#0#PHP" expanded="false" /> <element signature="e#490#1228#0#PHP" expanded="false" /> @@ -1038,49 +1040,75 @@ <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#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#64826#0#PHP" expanded="false" /> - <element signature="e#64831#67366#0#PHP" expanded="false" /> - <element signature="e#65026#65163#1#PHP" expanded="false" /> - <element signature="e#65193#65333#1#PHP" expanded="false" /> - <element signature="e#66003#66087#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#64825#0#PHP" expanded="false" /> + <element signature="e#64830#67365#0#PHP" expanded="false" /> + <element signature="e#65025#65162#1#PHP" expanded="false" /> + <element signature="e#65192#65332#1#PHP" expanded="false" /> + <element signature="e#66002#66086#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="709"> + <caret line="643" column="48" lean-forward="true" selection-start-line="643" selection-start-column="48" selection-end-line="643" selection-end-column="48" /> + <folding> + <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#16036#0#PHP" expanded="false" /> + <element signature="e#16042#16462#0#PHP" expanded="false" /> + <element signature="e#16467#26491#0#PHP" expanded="false" /> + <element signature="e#26508#26805#0#PHP" expanded="false" /> + <element signature="e#26810#27203#0#PHP" expanded="false" /> + <element signature="e#27230#30708#0#PHP" expanded="false" /> + <element signature="e#33674#39605#0#PHP" expanded="false" /> + <element signature="e#35490#38995#0#PHP" expanded="false" /> + <element signature="e#37569#37956#0#PHP" expanded="false" /> + <element signature="e#38017#38973#0#PHP" expanded="false" /> + <element signature="e#39634#46806#0#PHP" expanded="false" /> + <element signature="e#46829#47046#0#PHP" expanded="false" /> </folding> </state> </provider> diff --git a/application/api/controller/Pay.php b/application/api/controller/Pay.php index 194f842..eada153 100644 --- a/application/api/controller/Pay.php +++ b/application/api/controller/Pay.php @@ -641,7 +641,7 @@ class Pay extends Api Db::startTrans(); try{ //判断用户充值金额是否大于等于8000 - if($data['money']>=8000){ + if($data['money']>=0.8){ //大于等于的情况 $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 9a0b771..f269e12 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']<=8000){ + }elseif ( $param['total']<=0.8){ $this->error(['code'=>3,'msg'=>'开通会员至少需要8000元哦']); }else{ $param['createtime'] = time(); -- libgit2 0.24.0