郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 677ac5f6c720b58064a9ad957e9523f9cbb13ed4 1 个父辈 66e3ffc8
1 个管道 的构建 通过 耗费 3 秒

判断用户是否已经注册过

内嵌 并排对比
正在显示 4 个修改的文件 包含 238 行增加 和 191 行删除
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" />
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/PayController.php" afterPath="$PROJECT_DIR$/api/index/controller/PayController.php" /> 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/PayController.php" afterPath="$PROJECT_DIR$/api/index/controller/PayController.php" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
8 </list> 9 </list>
9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
10 <option name="TRACKING_ENABLED" value="true" /> 11 <option name="TRACKING_ENABLED" value="true" />
@@ -29,112 +30,118 @@ @@ -29,112 +30,118 @@
29 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false"> 30 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
30 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 31 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
31 <provider selected="true" editor-type-id="text-editor"> 32 <provider selected="true" editor-type-id="text-editor">
32 - <state relative-caret-position="0">  
33 - <caret line="37" column="27" lean-forward="false" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" /> 33 + <state relative-caret-position="66">
  34 + <caret line="99" column="7" lean-forward="true" selection-start-line="99" selection-start-column="7" selection-end-line="99" selection-end-column="7" />
34 <folding> 35 <folding>
35 <element signature="e#366#715#0#PHP" expanded="false" /> 36 <element signature="e#366#715#0#PHP" expanded="false" />
36 <element signature="e#720#1532#0#PHP" expanded="false" /> 37 <element signature="e#720#1532#0#PHP" expanded="false" />
37 - <element signature="e#1538#1767#0#PHP" expanded="false" />  
38 - <element signature="e#1772#3407#0#PHP" expanded="false" />  
39 - <element signature="e#3413#3653#0#PHP" expanded="false" />  
40 - <element signature="e#3658#3893#0#PHP" expanded="false" />  
41 - <element signature="e#3899#4246#0#PHP" expanded="false" />  
42 - <element signature="e#4251#4697#0#PHP" expanded="false" />  
43 - <element signature="e#4703#4963#0#PHP" expanded="false" />  
44 - <element signature="e#4968#5169#0#PHP" expanded="false" />  
45 - <element signature="e#5175#5437#0#PHP" expanded="false" />  
46 - <element signature="e#5442#5647#0#PHP" expanded="false" />  
47 - <element signature="e#5653#6132#0#PHP" expanded="false" />  
48 - <element signature="e#6137#8256#0#PHP" expanded="false" />  
49 - <element signature="e#8279#8810#0#PHP" expanded="false" />  
50 - <element signature="e#8816#9096#0#PHP" expanded="false" />  
51 - <element signature="e#9101#9493#0#PHP" expanded="false" />  
52 - <element signature="e#9499#9783#0#PHP" expanded="false" />  
53 - <element signature="e#9788#10827#0#PHP" expanded="false" />  
54 - <element signature="e#10833#11121#0#PHP" expanded="false" />  
55 - <element signature="e#11126#12161#0#PHP" expanded="false" />  
56 - <element signature="e#12167#12748#0#PHP" expanded="false" />  
57 - <element signature="e#12753#14141#0#PHP" expanded="false" />  
58 - <element signature="e#14147#14603#0#PHP" expanded="false" />  
59 - <element signature="e#14608#16571#0#PHP" expanded="false" />  
60 - <element signature="e#16594#16949#0#PHP" expanded="false" />  
61 - <element signature="e#16955#17668#0#PHP" expanded="false" />  
62 - <element signature="e#17673#19130#0#PHP" expanded="false" />  
63 - <element signature="e#19136#19597#0#PHP" expanded="false" />  
64 - <element signature="e#19602#22624#0#PHP" expanded="false" />  
65 - <element signature="e#22630#23239#0#PHP" expanded="false" />  
66 - <element signature="e#23244#24529#0#PHP" expanded="false" />  
67 - <element signature="e#24535#24892#0#PHP" expanded="false" />  
68 - <element signature="e#24897#25778#0#PHP" expanded="false" />  
69 - <element signature="e#25784#26136#0#PHP" expanded="false" />  
70 - <element signature="e#26141#27219#0#PHP" expanded="false" />  
71 - <element signature="e#27225#27580#0#PHP" expanded="false" />  
72 - <element signature="e#27585#28679#0#PHP" expanded="false" />  
73 - <element signature="e#28685#29109#0#PHP" expanded="false" />  
74 - <element signature="e#29114#29725#0#PHP" expanded="false" />  
75 - <element signature="e#29731#30227#0#PHP" expanded="false" />  
76 - <element signature="e#30232#31929#0#PHP" expanded="false" />  
77 - <element signature="e#31935#32219#0#PHP" expanded="false" />  
78 - <element signature="e#32224#32860#0#PHP" expanded="false" />  
79 - <element signature="e#32881#33200#0#PHP" expanded="false" />  
80 - <element signature="e#33206#33614#0#PHP" expanded="false" />  
81 - <element signature="e#33620#34379#0#PHP" expanded="false" />  
82 - <element signature="e#34398#35262#0#PHP" expanded="false" />  
83 - <element signature="e#35288#35688#0#PHP" expanded="false" />  
84 - <element signature="e#35711#36284#0#PHP" expanded="false" />  
85 - <element signature="e#36307#37117#0#PHP" expanded="false" />  
86 - <element signature="e#37123#37722#0#PHP" expanded="false" />  
87 - <element signature="e#37727#38691#0#PHP" expanded="false" />  
88 - <element signature="e#38697#39364#0#PHP" expanded="false" />  
89 - <element signature="e#39369#40410#0#PHP" expanded="false" />  
90 - <element signature="e#40416#41079#0#PHP" expanded="false" />  
91 - <element signature="e#41084#42111#0#PHP" expanded="false" />  
92 - <element signature="e#42118#42549#0#PHP" expanded="false" />  
93 - <element signature="e#42554#43132#0#PHP" expanded="false" />  
94 - <element signature="e#43138#43567#0#PHP" expanded="false" />  
95 - <element signature="e#43572#44174#0#PHP" expanded="false" />  
96 - <element signature="e#44180#44607#0#PHP" expanded="false" />  
97 - <element signature="e#44612#45178#0#PHP" expanded="false" /> 38 + <element signature="e#1538#1796#0#PHP" expanded="false" />
  39 + <element signature="e#1801#2184#0#PHP" expanded="false" />
  40 + <element signature="e#2190#2419#0#PHP" expanded="false" />
  41 + <element signature="e#2424#4059#0#PHP" expanded="false" />
  42 + <element signature="e#4065#4305#0#PHP" expanded="false" />
  43 + <element signature="e#4310#4545#0#PHP" expanded="false" />
  44 + <element signature="e#4551#4898#0#PHP" expanded="false" />
  45 + <element signature="e#4903#5349#0#PHP" expanded="false" />
  46 + <element signature="e#5355#5615#0#PHP" expanded="false" />
  47 + <element signature="e#5620#5821#0#PHP" expanded="false" />
  48 + <element signature="e#5827#6089#0#PHP" expanded="false" />
  49 + <element signature="e#6094#6299#0#PHP" expanded="false" />
  50 + <element signature="e#6305#6784#0#PHP" expanded="false" />
  51 + <element signature="e#6789#8908#0#PHP" expanded="false" />
  52 + <element signature="e#8931#9462#0#PHP" expanded="false" />
  53 + <element signature="e#9468#9748#0#PHP" expanded="false" />
  54 + <element signature="e#9753#10145#0#PHP" expanded="false" />
  55 + <element signature="e#10151#10435#0#PHP" expanded="false" />
  56 + <element signature="e#10440#11479#0#PHP" expanded="false" />
  57 + <element signature="e#11485#11773#0#PHP" expanded="false" />
  58 + <element signature="e#11778#12813#0#PHP" expanded="false" />
  59 + <element signature="e#12819#13400#0#PHP" expanded="false" />
  60 + <element signature="e#13405#14793#0#PHP" expanded="false" />
  61 + <element signature="e#14799#15255#0#PHP" expanded="false" />
  62 + <element signature="e#15260#17223#0#PHP" expanded="false" />
  63 + <element signature="e#17246#17601#0#PHP" expanded="false" />
  64 + <element signature="e#17607#18320#0#PHP" expanded="false" />
  65 + <element signature="e#18325#19782#0#PHP" expanded="false" />
  66 + <element signature="e#19788#20249#0#PHP" expanded="false" />
  67 + <element signature="e#20254#23276#0#PHP" expanded="false" />
  68 + <element signature="e#23282#23891#0#PHP" expanded="false" />
  69 + <element signature="e#23896#25181#0#PHP" expanded="false" />
  70 + <element signature="e#25187#25544#0#PHP" expanded="false" />
  71 + <element signature="e#25549#26430#0#PHP" expanded="false" />
  72 + <element signature="e#26436#26788#0#PHP" expanded="false" />
  73 + <element signature="e#26793#27871#0#PHP" expanded="false" />
  74 + <element signature="e#27877#28232#0#PHP" expanded="false" />
  75 + <element signature="e#28237#29331#0#PHP" expanded="false" />
  76 + <element signature="e#29337#29761#0#PHP" expanded="false" />
  77 + <element signature="e#29766#30377#0#PHP" expanded="false" />
  78 + <element signature="e#30383#30879#0#PHP" expanded="false" />
  79 + <element signature="e#30884#32581#0#PHP" expanded="false" />
  80 + <element signature="e#32587#32871#0#PHP" expanded="false" />
  81 + <element signature="e#32876#33512#0#PHP" expanded="false" />
  82 + <element signature="e#33533#33852#0#PHP" expanded="false" />
  83 + <element signature="e#33858#34266#0#PHP" expanded="false" />
  84 + <element signature="e#34272#35031#0#PHP" expanded="false" />
  85 + <element signature="e#35050#35914#0#PHP" expanded="false" />
  86 + <element signature="e#35940#36340#0#PHP" expanded="false" />
  87 + <element signature="e#36363#36936#0#PHP" expanded="false" />
  88 + <element signature="e#36959#37769#0#PHP" expanded="false" />
  89 + <element signature="e#37775#38374#0#PHP" expanded="false" />
  90 + <element signature="e#38379#39343#0#PHP" expanded="false" />
  91 + <element signature="e#39349#40016#0#PHP" expanded="false" />
  92 + <element signature="e#40021#41062#0#PHP" expanded="false" />
  93 + <element signature="e#41068#41731#0#PHP" expanded="false" />
  94 + <element signature="e#41736#42763#0#PHP" expanded="false" />
  95 + <element signature="e#42770#43201#0#PHP" expanded="false" />
  96 + <element signature="e#43206#43784#0#PHP" expanded="false" />
  97 + <element signature="e#43790#44219#0#PHP" expanded="false" />
  98 + <element signature="e#44224#44826#0#PHP" expanded="false" />
  99 + <element signature="e#44832#45259#0#PHP" expanded="false" />
  100 + <element signature="e#45264#45830#0#PHP" expanded="false" />
98 </folding> 101 </folding>
99 </state> 102 </state>
100 </provider> 103 </provider>
101 </entry> 104 </entry>
102 </file> 105 </file>
103 - <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="false"> 106 + <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true">
104 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 107 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
105 <provider selected="true" editor-type-id="text-editor"> 108 <provider selected="true" editor-type-id="text-editor">
106 - <state relative-caret-position="537">  
107 - <caret line="99" column="37" lean-forward="true" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" /> 109 + <state relative-caret-position="480">
  110 + <caret line="91" column="26" lean-forward="false" selection-start-line="91" selection-start-column="26" selection-end-line="91" selection-end-column="26" />
108 <folding> 111 <folding>
109 <element signature="e#131#162#0#PHP" expanded="true" /> 112 <element signature="e#131#162#0#PHP" expanded="true" />
110 <element signature="e#336#608#0#PHP" expanded="false" /> 113 <element signature="e#336#608#0#PHP" expanded="false" />
111 <element signature="e#614#976#0#PHP" expanded="false" /> 114 <element signature="e#614#976#0#PHP" expanded="false" />
112 - <element signature="e#981#1841#0#PHP" expanded="false" />  
113 - <element signature="e#1847#2084#0#PHP" expanded="false" />  
114 - <element signature="e#2792#3034#0#PHP" expanded="false" />  
115 - <element signature="e#3040#3378#0#PHP" expanded="false" />  
116 - <element signature="e#4261#4740#0#PHP" expanded="false" />  
117 - <element signature="e#4745#5312#0#PHP" expanded="false" /> 115 + <element signature="e#981#2020#0#PHP" expanded="false" />
  116 + <element signature="e#2026#2263#0#PHP" expanded="false" />
  117 + <element signature="e#2268#2965#0#PHP" expanded="false" />
  118 + <element signature="e#2971#3213#0#PHP" expanded="false" />
  119 + <element signature="e#3219#3557#0#PHP" expanded="false" />
  120 + <element signature="e#3562#4434#0#PHP" expanded="false" />
  121 + <element signature="e#4440#4919#0#PHP" expanded="false" />
  122 + <element signature="e#4924#5491#0#PHP" expanded="false" />
118 </folding> 123 </folding>
119 </state> 124 </state>
120 </provider> 125 </provider>
121 </entry> 126 </entry>
122 </file> 127 </file>
123 - <file leaf-file-name="PayController.php" pinned="false" current-in-tab="true"> 128 + <file leaf-file-name="PayController.php" pinned="false" current-in-tab="false">
124 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php"> 129 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
125 <provider selected="true" editor-type-id="text-editor"> 130 <provider selected="true" editor-type-id="text-editor">
126 - <state relative-caret-position="-36">  
127 - <caret line="65" column="28" lean-forward="false" selection-start-line="65" selection-start-column="28" selection-end-line="65" selection-end-column="28" /> 131 + <state relative-caret-position="305">
  132 + <caret line="60" column="0" lean-forward="true" selection-start-line="60" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
128 <folding> 133 <folding>
129 <element signature="e#324#855#0#PHP" expanded="false" /> 134 <element signature="e#324#855#0#PHP" expanded="false" />
130 <element signature="e#861#925#0#PHP" expanded="false" /> 135 <element signature="e#861#925#0#PHP" expanded="false" />
131 <element signature="e#930#1763#0#PHP" expanded="false" /> 136 <element signature="e#930#1763#0#PHP" expanded="false" />
132 <element signature="e#1769#1850#0#PHP" expanded="false" /> 137 <element signature="e#1769#1850#0#PHP" expanded="false" />
133 - <element signature="e#1855#3845#0#PHP" expanded="false" />  
134 - <element signature="e#3852#3875#0#PHP" expanded="false" />  
135 - <element signature="e#3880#4139#0#PHP" expanded="false" />  
136 - <element signature="e#4146#4195#0#PHP" expanded="false" />  
137 - <element signature="e#4200#4628#0#PHP" expanded="false" /> 138 + <element signature="e#1855#3907#0#PHP" expanded="false" />
  139 + <element signature="e#3914#3937#0#PHP" expanded="false" />
  140 + <element signature="e#3942#4201#0#PHP" expanded="false" />
  141 + <element signature="e#4208#4257#0#PHP" expanded="false" />
  142 + <element signature="e#4262#4690#0#PHP" expanded="false" />
  143 + <element signature="e#4696#4760#0#PHP" expanded="false" />
  144 + <element signature="e#4765#5642#0#PHP" expanded="false" />
138 </folding> 145 </folding>
139 </state> 146 </state>
140 </provider> 147 </provider>
@@ -206,11 +213,11 @@ @@ -206,11 +213,11 @@
206 <option value="$PROJECT_DIR$/api/config.php" /> 213 <option value="$PROJECT_DIR$/api/config.php" />
207 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" /> 214 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
208 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" /> 215 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
209 - <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />  
210 <option value="$PROJECT_DIR$/simplewind/cmf/common.php" /> 216 <option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
211 - <option value="$PROJECT_DIR$/api/index/controller/PayController.php" />  
212 - <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />  
213 <option value="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" /> 217 <option value="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" />
  218 + <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
  219 + <option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
  220 + <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
214 </list> 221 </list>
215 </option> 222 </option>
216 </component> 223 </component>
@@ -229,10 +236,10 @@ @@ -229,10 +236,10 @@
229 </component> 236 </component>
230 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 237 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
231 <component name="ProjectFrameBounds" extendedState="1"> 238 <component name="ProjectFrameBounds" extendedState="1">
232 - <option name="x" value="59" />  
233 - <option name="y" value="96" /> 239 + <option name="x" value="117" />
  240 + <option name="y" value="124" />
234 <option name="width" value="1814" /> 241 <option name="width" value="1814" />
235 - <option name="height" value="1009" /> 242 + <option name="height" value="1042" />
236 </component> 243 </component>
237 <component name="ProjectView"> 244 <component name="ProjectView">
238 <navigator currentView="ProjectPane" proportions="" version="1"> 245 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -308,7 +315,7 @@ @@ -308,7 +315,7 @@
308 </component> 315 </component>
309 <component name="PropertiesComponent"> 316 <component name="PropertiesComponent">
310 <property name="WebServerToolWindowFactoryState" value="false" /> 317 <property name="WebServerToolWindowFactoryState" value="false" />
311 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../hotel" /> 318 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" />
312 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 319 <property name="DefaultHtmlFileTemplate" value="HTML File" />
313 </component> 320 </component>
314 <component name="RecentsManager"> 321 <component name="RecentsManager">
@@ -407,15 +414,15 @@ @@ -407,15 +414,15 @@
407 <workItem from="1575506248144" duration="15103000" /> 414 <workItem from="1575506248144" duration="15103000" />
408 <workItem from="1575527294268" duration="10705000" /> 415 <workItem from="1575527294268" duration="10705000" />
409 <workItem from="1575543830603" duration="2980000" /> 416 <workItem from="1575543830603" duration="2980000" />
410 - <workItem from="1575592067577" duration="3070000" /> 417 + <workItem from="1575592067577" duration="6259000" />
411 </task> 418 </task>
412 <servers /> 419 <servers />
413 </component> 420 </component>
414 <component name="TimeTrackingManager"> 421 <component name="TimeTrackingManager">
415 - <option name="totallyTimeSpent" value="498567000" /> 422 + <option name="totallyTimeSpent" value="501756000" />
416 </component> 423 </component>
417 <component name="ToolWindowManager"> 424 <component name="ToolWindowManager">
418 - <frame x="59" y="96" width="1814" height="1009" extended-state="1" /> 425 + <frame x="117" y="124" width="1814" height="1042" extended-state="1" />
419 <editor active="true" /> 426 <editor active="true" />
420 <layout> 427 <layout>
421 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15621437" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 428 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15621437" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -469,13 +476,6 @@ @@ -469,13 +476,6 @@
469 <watches-manager /> 476 <watches-manager />
470 </component> 477 </component>
471 <component name="editorHistoryManager"> 478 <component name="editorHistoryManager">
472 - <entry file="file://$PROJECT_DIR$/app/admin/controller/RecycleController.php">  
473 - <provider selected="true" editor-type-id="text-editor">  
474 - <state relative-caret-position="180">  
475 - <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />  
476 - </state>  
477 - </provider>  
478 - </entry>  
479 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rtype/edit.html"> 479 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rtype/edit.html">
480 <provider selected="true" editor-type-id="text-editor"> 480 <provider selected="true" editor-type-id="text-editor">
481 <state relative-caret-position="0"> 481 <state relative-caret-position="0">
@@ -882,78 +882,6 @@ @@ -882,78 +882,6 @@
882 </state> 882 </state>
883 </provider> 883 </provider>
884 </entry> 884 </entry>
885 - <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">  
886 - <provider selected="true" editor-type-id="text-editor">  
887 - <state relative-caret-position="0">  
888 - <caret line="37" column="27" lean-forward="false" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />  
889 - <folding>  
890 - <element signature="e#366#715#0#PHP" expanded="false" />  
891 - <element signature="e#720#1532#0#PHP" expanded="false" />  
892 - <element signature="e#1538#1767#0#PHP" expanded="false" />  
893 - <element signature="e#1772#3407#0#PHP" expanded="false" />  
894 - <element signature="e#3413#3653#0#PHP" expanded="false" />  
895 - <element signature="e#3658#3893#0#PHP" expanded="false" />  
896 - <element signature="e#3899#4246#0#PHP" expanded="false" />  
897 - <element signature="e#4251#4697#0#PHP" expanded="false" />  
898 - <element signature="e#4703#4963#0#PHP" expanded="false" />  
899 - <element signature="e#4968#5169#0#PHP" expanded="false" />  
900 - <element signature="e#5175#5437#0#PHP" expanded="false" />  
901 - <element signature="e#5442#5647#0#PHP" expanded="false" />  
902 - <element signature="e#5653#6132#0#PHP" expanded="false" />  
903 - <element signature="e#6137#8256#0#PHP" expanded="false" />  
904 - <element signature="e#8279#8810#0#PHP" expanded="false" />  
905 - <element signature="e#8816#9096#0#PHP" expanded="false" />  
906 - <element signature="e#9101#9493#0#PHP" expanded="false" />  
907 - <element signature="e#9499#9783#0#PHP" expanded="false" />  
908 - <element signature="e#9788#10827#0#PHP" expanded="false" />  
909 - <element signature="e#10833#11121#0#PHP" expanded="false" />  
910 - <element signature="e#11126#12161#0#PHP" expanded="false" />  
911 - <element signature="e#12167#12748#0#PHP" expanded="false" />  
912 - <element signature="e#12753#14141#0#PHP" expanded="false" />  
913 - <element signature="e#14147#14603#0#PHP" expanded="false" />  
914 - <element signature="e#14608#16571#0#PHP" expanded="false" />  
915 - <element signature="e#16594#16949#0#PHP" expanded="false" />  
916 - <element signature="e#16955#17668#0#PHP" expanded="false" />  
917 - <element signature="e#17673#19130#0#PHP" expanded="false" />  
918 - <element signature="e#19136#19597#0#PHP" expanded="false" />  
919 - <element signature="e#19602#22624#0#PHP" expanded="false" />  
920 - <element signature="e#22630#23239#0#PHP" expanded="false" />  
921 - <element signature="e#23244#24529#0#PHP" expanded="false" />  
922 - <element signature="e#24535#24892#0#PHP" expanded="false" />  
923 - <element signature="e#24897#25778#0#PHP" expanded="false" />  
924 - <element signature="e#25784#26136#0#PHP" expanded="false" />  
925 - <element signature="e#26141#27219#0#PHP" expanded="false" />  
926 - <element signature="e#27225#27580#0#PHP" expanded="false" />  
927 - <element signature="e#27585#28679#0#PHP" expanded="false" />  
928 - <element signature="e#28685#29109#0#PHP" expanded="false" />  
929 - <element signature="e#29114#29725#0#PHP" expanded="false" />  
930 - <element signature="e#29731#30227#0#PHP" expanded="false" />  
931 - <element signature="e#30232#31929#0#PHP" expanded="false" />  
932 - <element signature="e#31935#32219#0#PHP" expanded="false" />  
933 - <element signature="e#32224#32860#0#PHP" expanded="false" />  
934 - <element signature="e#32881#33200#0#PHP" expanded="false" />  
935 - <element signature="e#33206#33614#0#PHP" expanded="false" />  
936 - <element signature="e#33620#34379#0#PHP" expanded="false" />  
937 - <element signature="e#34398#35262#0#PHP" expanded="false" />  
938 - <element signature="e#35288#35688#0#PHP" expanded="false" />  
939 - <element signature="e#35711#36284#0#PHP" expanded="false" />  
940 - <element signature="e#36307#37117#0#PHP" expanded="false" />  
941 - <element signature="e#37123#37722#0#PHP" expanded="false" />  
942 - <element signature="e#37727#38691#0#PHP" expanded="false" />  
943 - <element signature="e#38697#39364#0#PHP" expanded="false" />  
944 - <element signature="e#39369#40410#0#PHP" expanded="false" />  
945 - <element signature="e#40416#41079#0#PHP" expanded="false" />  
946 - <element signature="e#41084#42111#0#PHP" expanded="false" />  
947 - <element signature="e#42118#42549#0#PHP" expanded="false" />  
948 - <element signature="e#42554#43132#0#PHP" expanded="false" />  
949 - <element signature="e#43138#43567#0#PHP" expanded="false" />  
950 - <element signature="e#43572#44174#0#PHP" expanded="false" />  
951 - <element signature="e#44180#44607#0#PHP" expanded="false" />  
952 - <element signature="e#44612#45178#0#PHP" expanded="false" />  
953 - </folding>  
954 - </state>  
955 - </provider>  
956 - </entry>  
957 <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Foundation/Application.php"> 885 <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Foundation/Application.php">
958 <provider selected="true" editor-type-id="text-editor"> 886 <provider selected="true" editor-type-id="text-editor">
959 <state relative-caret-position="291"> 887 <state relative-caret-position="291">
@@ -974,38 +902,124 @@ @@ -974,38 +902,124 @@
974 </state> 902 </state>
975 </provider> 903 </provider>
976 </entry> 904 </entry>
977 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 905 + <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Payment/Order.php">
978 <provider selected="true" editor-type-id="text-editor"> 906 <provider selected="true" editor-type-id="text-editor">
979 - <state relative-caret-position="537">  
980 - <caret line="99" column="37" lean-forward="true" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />  
981 - <folding>  
982 - <element signature="e#131#162#0#PHP" expanded="true" />  
983 - <element signature="e#336#608#0#PHP" expanded="false" />  
984 - <element signature="e#614#976#0#PHP" expanded="false" />  
985 - <element signature="e#981#1841#0#PHP" expanded="false" />  
986 - <element signature="e#1847#2084#0#PHP" expanded="false" />  
987 - <element signature="e#2792#3034#0#PHP" expanded="false" />  
988 - <element signature="e#3040#3378#0#PHP" expanded="false" />  
989 - <element signature="e#4261#4740#0#PHP" expanded="false" />  
990 - <element signature="e#4745#5312#0#PHP" expanded="false" />  
991 - </folding> 907 + <state relative-caret-position="679">
  908 + <caret line="78" column="20" lean-forward="false" selection-start-line="78" selection-start-column="20" selection-end-line="78" selection-end-column="20" />
  909 + <folding />
992 </state> 910 </state>
993 </provider> 911 </provider>
994 </entry> 912 </entry>
995 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php"> 913 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
996 <provider selected="true" editor-type-id="text-editor"> 914 <provider selected="true" editor-type-id="text-editor">
997 - <state relative-caret-position="-36">  
998 - <caret line="65" column="28" lean-forward="false" selection-start-line="65" selection-start-column="28" selection-end-line="65" selection-end-column="28" /> 915 + <state relative-caret-position="305">
  916 + <caret line="60" column="0" lean-forward="true" selection-start-line="60" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
999 <folding> 917 <folding>
1000 <element signature="e#324#855#0#PHP" expanded="false" /> 918 <element signature="e#324#855#0#PHP" expanded="false" />
1001 <element signature="e#861#925#0#PHP" expanded="false" /> 919 <element signature="e#861#925#0#PHP" expanded="false" />
1002 <element signature="e#930#1763#0#PHP" expanded="false" /> 920 <element signature="e#930#1763#0#PHP" expanded="false" />
1003 <element signature="e#1769#1850#0#PHP" expanded="false" /> 921 <element signature="e#1769#1850#0#PHP" expanded="false" />
1004 - <element signature="e#1855#3845#0#PHP" expanded="false" />  
1005 - <element signature="e#3852#3875#0#PHP" expanded="false" />  
1006 - <element signature="e#3880#4139#0#PHP" expanded="false" />  
1007 - <element signature="e#4146#4195#0#PHP" expanded="false" />  
1008 - <element signature="e#4200#4628#0#PHP" expanded="false" /> 922 + <element signature="e#1855#3907#0#PHP" expanded="false" />
  923 + <element signature="e#3914#3937#0#PHP" expanded="false" />
  924 + <element signature="e#3942#4201#0#PHP" expanded="false" />
  925 + <element signature="e#4208#4257#0#PHP" expanded="false" />
  926 + <element signature="e#4262#4690#0#PHP" expanded="false" />
  927 + <element signature="e#4696#4760#0#PHP" expanded="false" />
  928 + <element signature="e#4765#5642#0#PHP" expanded="false" />
  929 + </folding>
  930 + </state>
  931 + </provider>
  932 + </entry>
  933 + <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
  934 + <provider selected="true" editor-type-id="text-editor">
  935 + <state relative-caret-position="66">
  936 + <caret line="99" column="7" lean-forward="true" selection-start-line="99" selection-start-column="7" selection-end-line="99" selection-end-column="7" />
  937 + <folding>
  938 + <element signature="e#366#715#0#PHP" expanded="false" />
  939 + <element signature="e#720#1532#0#PHP" expanded="false" />
  940 + <element signature="e#1538#1796#0#PHP" expanded="false" />
  941 + <element signature="e#1801#2184#0#PHP" expanded="false" />
  942 + <element signature="e#2190#2419#0#PHP" expanded="false" />
  943 + <element signature="e#2424#4059#0#PHP" expanded="false" />
  944 + <element signature="e#4065#4305#0#PHP" expanded="false" />
  945 + <element signature="e#4310#4545#0#PHP" expanded="false" />
  946 + <element signature="e#4551#4898#0#PHP" expanded="false" />
  947 + <element signature="e#4903#5349#0#PHP" expanded="false" />
  948 + <element signature="e#5355#5615#0#PHP" expanded="false" />
  949 + <element signature="e#5620#5821#0#PHP" expanded="false" />
  950 + <element signature="e#5827#6089#0#PHP" expanded="false" />
  951 + <element signature="e#6094#6299#0#PHP" expanded="false" />
  952 + <element signature="e#6305#6784#0#PHP" expanded="false" />
  953 + <element signature="e#6789#8908#0#PHP" expanded="false" />
  954 + <element signature="e#8931#9462#0#PHP" expanded="false" />
  955 + <element signature="e#9468#9748#0#PHP" expanded="false" />
  956 + <element signature="e#9753#10145#0#PHP" expanded="false" />
  957 + <element signature="e#10151#10435#0#PHP" expanded="false" />
  958 + <element signature="e#10440#11479#0#PHP" expanded="false" />
  959 + <element signature="e#11485#11773#0#PHP" expanded="false" />
  960 + <element signature="e#11778#12813#0#PHP" expanded="false" />
  961 + <element signature="e#12819#13400#0#PHP" expanded="false" />
  962 + <element signature="e#13405#14793#0#PHP" expanded="false" />
  963 + <element signature="e#14799#15255#0#PHP" expanded="false" />
  964 + <element signature="e#15260#17223#0#PHP" expanded="false" />
  965 + <element signature="e#17246#17601#0#PHP" expanded="false" />
  966 + <element signature="e#17607#18320#0#PHP" expanded="false" />
  967 + <element signature="e#18325#19782#0#PHP" expanded="false" />
  968 + <element signature="e#19788#20249#0#PHP" expanded="false" />
  969 + <element signature="e#20254#23276#0#PHP" expanded="false" />
  970 + <element signature="e#23282#23891#0#PHP" expanded="false" />
  971 + <element signature="e#23896#25181#0#PHP" expanded="false" />
  972 + <element signature="e#25187#25544#0#PHP" expanded="false" />
  973 + <element signature="e#25549#26430#0#PHP" expanded="false" />
  974 + <element signature="e#26436#26788#0#PHP" expanded="false" />
  975 + <element signature="e#26793#27871#0#PHP" expanded="false" />
  976 + <element signature="e#27877#28232#0#PHP" expanded="false" />
  977 + <element signature="e#28237#29331#0#PHP" expanded="false" />
  978 + <element signature="e#29337#29761#0#PHP" expanded="false" />
  979 + <element signature="e#29766#30377#0#PHP" expanded="false" />
  980 + <element signature="e#30383#30879#0#PHP" expanded="false" />
  981 + <element signature="e#30884#32581#0#PHP" expanded="false" />
  982 + <element signature="e#32587#32871#0#PHP" expanded="false" />
  983 + <element signature="e#32876#33512#0#PHP" expanded="false" />
  984 + <element signature="e#33533#33852#0#PHP" expanded="false" />
  985 + <element signature="e#33858#34266#0#PHP" expanded="false" />
  986 + <element signature="e#34272#35031#0#PHP" expanded="false" />
  987 + <element signature="e#35050#35914#0#PHP" expanded="false" />
  988 + <element signature="e#35940#36340#0#PHP" expanded="false" />
  989 + <element signature="e#36363#36936#0#PHP" expanded="false" />
  990 + <element signature="e#36959#37769#0#PHP" expanded="false" />
  991 + <element signature="e#37775#38374#0#PHP" expanded="false" />
  992 + <element signature="e#38379#39343#0#PHP" expanded="false" />
  993 + <element signature="e#39349#40016#0#PHP" expanded="false" />
  994 + <element signature="e#40021#41062#0#PHP" expanded="false" />
  995 + <element signature="e#41068#41731#0#PHP" expanded="false" />
  996 + <element signature="e#41736#42763#0#PHP" expanded="false" />
  997 + <element signature="e#42770#43201#0#PHP" expanded="false" />
  998 + <element signature="e#43206#43784#0#PHP" expanded="false" />
  999 + <element signature="e#43790#44219#0#PHP" expanded="false" />
  1000 + <element signature="e#44224#44826#0#PHP" expanded="false" />
  1001 + <element signature="e#44832#45259#0#PHP" expanded="false" />
  1002 + <element signature="e#45264#45830#0#PHP" expanded="false" />
  1003 + </folding>
  1004 + </state>
  1005 + </provider>
  1006 + </entry>
  1007 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
  1008 + <provider selected="true" editor-type-id="text-editor">
  1009 + <state relative-caret-position="480">
  1010 + <caret line="91" column="26" lean-forward="false" selection-start-line="91" selection-start-column="26" selection-end-line="91" selection-end-column="26" />
  1011 + <folding>
  1012 + <element signature="e#131#162#0#PHP" expanded="true" />
  1013 + <element signature="e#336#608#0#PHP" expanded="false" />
  1014 + <element signature="e#614#976#0#PHP" expanded="false" />
  1015 + <element signature="e#981#2020#0#PHP" expanded="false" />
  1016 + <element signature="e#2026#2263#0#PHP" expanded="false" />
  1017 + <element signature="e#2268#2965#0#PHP" expanded="false" />
  1018 + <element signature="e#2971#3213#0#PHP" expanded="false" />
  1019 + <element signature="e#3219#3557#0#PHP" expanded="false" />
  1020 + <element signature="e#3562#4434#0#PHP" expanded="false" />
  1021 + <element signature="e#4440#4919#0#PHP" expanded="false" />
  1022 + <element signature="e#4924#5491#0#PHP" expanded="false" />
1009 </folding> 1023 </folding>
1010 </state> 1024 </state>
1011 </provider> 1025 </provider>
@@ -60,6 +60,12 @@ class OrderController extends RestBaseController @@ -60,6 +60,12 @@ class OrderController extends RestBaseController
60 if($total<=0){ 60 if($total<=0){
61 $this->error('非法操作'); 61 $this->error('非法操作');
62 } 62 }
  63 + $money = Db::name('pay')
  64 + ->where('id',$pay_id)
  65 + ->find();
  66 + if($money['money'] != $total){
  67 + $this->success('请正确输入充值金额');
  68 + }
63 $arr['num'] = cmf_get_order_sn(); 69 $arr['num'] = cmf_get_order_sn();
64 $arr['user_id'] = $user_id; 70 $arr['user_id'] = $user_id;
65 $arr['pay_id'] = $pay_id; 71 $arr['pay_id'] = $pay_id;
@@ -94,6 +94,7 @@ class PayController extends HomeBaseController @@ -94,6 +94,7 @@ class PayController extends HomeBaseController
94 ->find(); 94 ->find();
95 $res['user_id'] = $order['user_id']; 95 $res['user_id'] = $order['user_id'];
96 $res['total'] = $arr['integral']; 96 $res['total'] = $arr['integral'];
  97 + $res['create_time'] = time();
97 $res['type'] = 1; 98 $res['type'] = 1;
98 Db::name('detail') 99 Db::name('detail')
99 ->insertGetId($res); 100 ->insertGetId($res);
@@ -101,7 +102,7 @@ class PayController extends HomeBaseController @@ -101,7 +102,7 @@ class PayController extends HomeBaseController
101 $list = Db::name('integral') 102 $list = Db::name('integral')
102 ->where('user_id',$order['user_id']) 103 ->where('user_id',$order['user_id'])
103 ->find(); 104 ->find();
104 - $now_integral = $list['now_integral']; 105 + $now_integral = $list['now_integral'] + $res['total'];
105 $add_total = $list['add_total'] + $res['total']; 106 $add_total = $list['add_total'] + $res['total'];
106 Db::name('integral') 107 Db::name('integral')
107 ->where('user_id',$order['user_id']) 108 ->where('user_id',$order['user_id'])
@@ -62,6 +62,32 @@ class UserController extends RestBaseController @@ -62,6 +62,32 @@ class UserController extends RestBaseController
62 } 62 }
63 63
64 /** 64 /**
  65 + * @title 判断用户是否已经注册过
  66 + * @description 判断用户是否已经注册过
  67 + * @author Guosheng
  68 + * @url /index/User/is_login
  69 + * @method POST
  70 + *
  71 + * @header name:XX-Token require:1 default: desc:token
  72 + *
  73 + * @return status:状态(1没有注册过2已经注册过)
  74 + */
  75 + public function is_login()
  76 + {
  77 + $user_id = $this->getUserId();
  78 + $info = Db::name('integral')
  79 + ->where('user_id',$user_id)
  80 + ->find();
  81 + if(empty($info)){
  82 + $data['status'] = 1;
  83 + $this->success('SUCCESS',$data);
  84 + }else{
  85 + $data['status'] = 2;
  86 + $this->success('SUCCESS',$data);
  87 + }
  88 + }
  89 +
  90 + /**
65 * @title 获取验证码 91 * @title 获取验证码
66 * @description 92 * @description
67 * @author Guosheng 93 * @author Guosheng