切换导航条
此项目
正在载入...
登录
郭盛
/
scrap
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
677ac5f6c720b58064a9ad957e9523f9cbb13ed4
1 个父辈
66e3ffc8
1 个管道 的构建
通过
耗费 3 秒
判断用户是否已经注册过
变更
4
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
238 行增加
和
191 行删除
.idea/workspace.xml
api/index/controller/OrderController.php
api/index/controller/PayController.php
api/index/controller/UserController.php
.idea/workspace.xml
查看文件 @
677ac5f
...
...
@@ -5,6 +5,7 @@
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/OrderController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/OrderController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/PayController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/PayController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/UserController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/UserController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -29,112 +30,118 @@
<file
leaf-file-name=
"UserController.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/UserController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"37"
column=
"27"
lean-forward=
"false"
selection-start-line=
"37"
selection-start-column=
"27"
selection-end-line=
"37"
selection-end-column=
"27"
/>
<state
relative-caret-position=
"66"
>
<caret
line=
"99"
column=
"7"
lean-forward=
"true"
selection-start-line=
"99"
selection-start-column=
"7"
selection-end-line=
"99"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#366#715#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#720#1532#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1538#1767#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1772#3407#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3413#3653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3658#3893#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3899#4246#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4251#4697#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4703#4963#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4968#5169#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5175#5437#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5442#5647#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5653#6132#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6137#8256#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8279#8810#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8816#9096#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9101#9493#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9499#9783#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9788#10827#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10833#11121#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11126#12161#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12167#12748#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12753#14141#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14147#14603#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14608#16571#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16594#16949#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16955#17668#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17673#19130#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19136#19597#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19602#22624#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22630#23239#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23244#24529#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24535#24892#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24897#25778#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25784#26136#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26141#27219#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27225#27580#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27585#28679#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28685#29109#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29114#29725#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29731#30227#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30232#31929#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31935#32219#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32224#32860#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32881#33200#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33206#33614#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33620#34379#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34398#35262#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35288#35688#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35711#36284#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36307#37117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37123#37722#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37727#38691#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38697#39364#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39369#40410#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40416#41079#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41084#42111#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42118#42549#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42554#43132#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43138#43567#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43572#44174#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44180#44607#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44612#45178#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1538#1796#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1801#2184#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2190#2419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2424#4059#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4065#4305#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4310#4545#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4551#4898#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4903#5349#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5355#5615#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5620#5821#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5827#6089#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6094#6299#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6305#6784#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6789#8908#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8931#9462#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9468#9748#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9753#10145#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10151#10435#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10440#11479#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11485#11773#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11778#12813#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12819#13400#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13405#14793#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14799#15255#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15260#17223#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17246#17601#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17607#18320#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18325#19782#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19788#20249#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20254#23276#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23282#23891#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23896#25181#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25187#25544#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25549#26430#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26436#26788#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26793#27871#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27877#28232#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28237#29331#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29337#29761#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29766#30377#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30383#30879#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30884#32581#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32587#32871#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32876#33512#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33533#33852#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33858#34266#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34272#35031#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35050#35914#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35940#36340#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36363#36936#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36959#37769#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37775#38374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38379#39343#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39349#40016#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40021#41062#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41068#41731#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41736#42763#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42770#43201#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43206#43784#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43790#44219#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44224#44826#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44832#45259#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45264#45830#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"OrderController.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
leaf-file-name=
"OrderController.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OrderController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"537"
>
<caret
line=
"99"
column=
"37"
lean-forward=
"true"
selection-start-line=
"99"
selection-start-column=
"37"
selection-end-line=
"99"
selection-end-column=
"37"
/>
<state
relative-caret-position=
"480"
>
<caret
line=
"91"
column=
"26"
lean-forward=
"false"
selection-start-line=
"91"
selection-start-column=
"26"
selection-end-line=
"91"
selection-end-column=
"26"
/>
<folding>
<element
signature=
"e#131#162#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#336#608#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#614#976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#981#1841#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1847#2084#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2792#3034#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3040#3378#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4261#4740#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4745#5312#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#981#2020#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2026#2263#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2268#2965#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2971#3213#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3219#3557#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3562#4434#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4440#4919#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4924#5491#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"PayController.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
leaf-file-name=
"PayController.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/PayController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-36"
>
<caret
line=
"65"
column=
"28"
lean-forward=
"false"
selection-start-line=
"65"
selection-start-column=
"28"
selection-end-line=
"65"
selection-end-column=
"28"
/>
<state
relative-caret-position=
"305"
>
<caret
line=
"60"
column=
"0"
lean-forward=
"true"
selection-start-line=
"60"
selection-start-column=
"0"
selection-end-line=
"60"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#324#855#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#861#925#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#930#1763#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1769#1850#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1855#3845#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3852#3875#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3880#4139#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4146#4195#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4200#4628#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1855#3907#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3914#3937#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3942#4201#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4208#4257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4262#4690#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4696#4760#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4765#5642#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -206,11 +213,11 @@
<option
value=
"$PROJECT_DIR$/api/config.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/PointController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/UserController.php"
/>
<option
value=
"$PROJECT_DIR$/simplewind/cmf/common.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/PayController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/OrderController.php"
/>
<option
value=
"$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/OrderController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/PayController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/UserController.php"
/>
</list>
</option>
</component>
...
...
@@ -229,10 +236,10 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"59"
/>
<option
name=
"y"
value=
"96"
/>
<option
name=
"x"
value=
"117"
/>
<option
name=
"y"
value=
"124"
/>
<option
name=
"width"
value=
"1814"
/>
<option
name=
"height"
value=
"10
09
"
/>
<option
name=
"height"
value=
"10
42
"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -308,7 +315,7 @@
</component>
<component
name=
"PropertiesComponent"
>
<property
name=
"WebServerToolWindowFactoryState"
value=
"false"
/>
<property
name=
"last_opened_file_path"
value=
"$PROJECT_DIR$/../../
hotel
"
/>
<property
name=
"last_opened_file_path"
value=
"$PROJECT_DIR$/../../
project/competition
"
/>
<property
name=
"DefaultHtmlFileTemplate"
value=
"HTML File"
/>
</component>
<component
name=
"RecentsManager"
>
...
...
@@ -407,15 +414,15 @@
<workItem
from=
"1575506248144"
duration=
"15103000"
/>
<workItem
from=
"1575527294268"
duration=
"10705000"
/>
<workItem
from=
"1575543830603"
duration=
"2980000"
/>
<workItem
from=
"1575592067577"
duration=
"
3070
000"
/>
<workItem
from=
"1575592067577"
duration=
"
6259
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"
498567
000"
/>
<option
name=
"totallyTimeSpent"
value=
"
501756
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
59"
y=
"96"
width=
"1814"
height=
"1009
"
extended-state=
"1"
/>
<frame
x=
"
117"
y=
"124"
width=
"1814"
height=
"1042
"
extended-state=
"1"
/>
<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.15621437"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -469,13 +476,6 @@
<watches-manager
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/RecycleController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"180"
>
<caret
line=
"17"
column=
"27"
lean-forward=
"false"
selection-start-line=
"17"
selection-start-column=
"27"
selection-end-line=
"17"
selection-end-column=
"27"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rtype/edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
...
...
@@ -882,78 +882,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/UserController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"37"
column=
"27"
lean-forward=
"false"
selection-start-line=
"37"
selection-start-column=
"27"
selection-end-line=
"37"
selection-end-column=
"27"
/>
<folding>
<element
signature=
"e#366#715#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#720#1532#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1538#1767#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1772#3407#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3413#3653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3658#3893#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3899#4246#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4251#4697#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4703#4963#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4968#5169#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5175#5437#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5442#5647#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5653#6132#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6137#8256#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8279#8810#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8816#9096#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9101#9493#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9499#9783#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9788#10827#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10833#11121#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11126#12161#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12167#12748#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12753#14141#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14147#14603#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14608#16571#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16594#16949#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16955#17668#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17673#19130#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19136#19597#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19602#22624#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22630#23239#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23244#24529#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24535#24892#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24897#25778#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25784#26136#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26141#27219#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27225#27580#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27585#28679#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28685#29109#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29114#29725#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29731#30227#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30232#31929#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31935#32219#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32224#32860#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32881#33200#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33206#33614#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33620#34379#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34398#35262#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35288#35688#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35711#36284#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36307#37117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37123#37722#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37727#38691#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38697#39364#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39369#40410#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40416#41079#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41084#42111#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42118#42549#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42554#43132#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43138#43567#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43572#44174#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44180#44607#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44612#45178#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Foundation/Application.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"291"
>
...
...
@@ -974,38 +902,124 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
api/index/controller/OrderControll
er.php"
>
<entry
file=
"file://$PROJECT_DIR$/
simplewind/vendor/overtrue/wechat/src/Payment/Ord
er.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"537"
>
<caret
line=
"99"
column=
"37"
lean-forward=
"true"
selection-start-line=
"99"
selection-start-column=
"37"
selection-end-line=
"99"
selection-end-column=
"37"
/>
<folding>
<element
signature=
"e#131#162#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#336#608#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#614#976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#981#1841#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1847#2084#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2792#3034#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3040#3378#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4261#4740#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4745#5312#0#PHP"
expanded=
"false"
/>
</folding>
<state
relative-caret-position=
"679"
>
<caret
line=
"78"
column=
"20"
lean-forward=
"false"
selection-start-line=
"78"
selection-start-column=
"20"
selection-end-line=
"78"
selection-end-column=
"20"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/PayController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-36"
>
<caret
line=
"65"
column=
"28"
lean-forward=
"false"
selection-start-line=
"65"
selection-start-column=
"28"
selection-end-line=
"65"
selection-end-column=
"28"
/>
<state
relative-caret-position=
"305"
>
<caret
line=
"60"
column=
"0"
lean-forward=
"true"
selection-start-line=
"60"
selection-start-column=
"0"
selection-end-line=
"60"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#324#855#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#861#925#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#930#1763#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1769#1850#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1855#3845#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3852#3875#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3880#4139#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4146#4195#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4200#4628#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1855#3907#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3914#3937#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3942#4201#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4208#4257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4262#4690#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4696#4760#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4765#5642#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/UserController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"66"
>
<caret
line=
"99"
column=
"7"
lean-forward=
"true"
selection-start-line=
"99"
selection-start-column=
"7"
selection-end-line=
"99"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#366#715#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#720#1532#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1538#1796#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1801#2184#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2190#2419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2424#4059#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4065#4305#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4310#4545#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4551#4898#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4903#5349#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5355#5615#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5620#5821#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5827#6089#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6094#6299#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6305#6784#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6789#8908#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8931#9462#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9468#9748#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9753#10145#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10151#10435#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10440#11479#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11485#11773#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11778#12813#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12819#13400#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13405#14793#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14799#15255#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15260#17223#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17246#17601#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17607#18320#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18325#19782#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19788#20249#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20254#23276#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23282#23891#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23896#25181#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25187#25544#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25549#26430#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26436#26788#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26793#27871#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27877#28232#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28237#29331#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29337#29761#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29766#30377#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30383#30879#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30884#32581#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32587#32871#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32876#33512#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33533#33852#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33858#34266#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34272#35031#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35050#35914#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35940#36340#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36363#36936#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36959#37769#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37775#38374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38379#39343#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39349#40016#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40021#41062#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41068#41731#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41736#42763#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42770#43201#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43206#43784#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43790#44219#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44224#44826#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44832#45259#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45264#45830#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OrderController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"480"
>
<caret
line=
"91"
column=
"26"
lean-forward=
"false"
selection-start-line=
"91"
selection-start-column=
"26"
selection-end-line=
"91"
selection-end-column=
"26"
/>
<folding>
<element
signature=
"e#131#162#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#336#608#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#614#976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#981#2020#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2026#2263#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2268#2965#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2971#3213#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3219#3557#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3562#4434#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4440#4919#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4924#5491#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/OrderController.php
查看文件 @
677ac5f
...
...
@@ -60,6 +60,12 @@ class OrderController extends RestBaseController
if
(
$total
<=
0
){
$this
->
error
(
'非法操作'
);
}
$money
=
Db
::
name
(
'pay'
)
->
where
(
'id'
,
$pay_id
)
->
find
();
if
(
$money
[
'money'
]
!=
$total
){
$this
->
success
(
'请正确输入充值金额'
);
}
$arr
[
'num'
]
=
cmf_get_order_sn
();
$arr
[
'user_id'
]
=
$user_id
;
$arr
[
'pay_id'
]
=
$pay_id
;
...
...
api/index/controller/PayController.php
查看文件 @
677ac5f
...
...
@@ -94,6 +94,7 @@ class PayController extends HomeBaseController
->
find
();
$res
[
'user_id'
]
=
$order
[
'user_id'
];
$res
[
'total'
]
=
$arr
[
'integral'
];
$res
[
'create_time'
]
=
time
();
$res
[
'type'
]
=
1
;
Db
::
name
(
'detail'
)
->
insertGetId
(
$res
);
...
...
@@ -101,7 +102,7 @@ class PayController extends HomeBaseController
$list
=
Db
::
name
(
'integral'
)
->
where
(
'user_id'
,
$order
[
'user_id'
])
->
find
();
$now_integral
=
$list
[
'now_integral'
];
$now_integral
=
$list
[
'now_integral'
]
+
$res
[
'total'
]
;
$add_total
=
$list
[
'add_total'
]
+
$res
[
'total'
];
Db
::
name
(
'integral'
)
->
where
(
'user_id'
,
$order
[
'user_id'
])
...
...
api/index/controller/UserController.php
查看文件 @
677ac5f
...
...
@@ -62,6 +62,32 @@ class UserController extends RestBaseController
}
/**
* @title 判断用户是否已经注册过
* @description 判断用户是否已经注册过
* @author Guosheng
* @url /index/User/is_login
* @method POST
*
* @header name:XX-Token require:1 default: desc:token
*
* @return status:状态(1没有注册过2已经注册过)
*/
public
function
is_login
()
{
$user_id
=
$this
->
getUserId
();
$info
=
Db
::
name
(
'integral'
)
->
where
(
'user_id'
,
$user_id
)
->
find
();
if
(
empty
(
$info
)){
$data
[
'status'
]
=
1
;
$this
->
success
(
'SUCCESS'
,
$data
);
}
else
{
$data
[
'status'
]
=
2
;
$this
->
success
(
'SUCCESS'
,
$data
);
}
}
/**
* @title 获取验证码
* @description
* @author Guosheng
...
...
请
注册
或
登录
后发表评论