切换导航条
此项目
正在载入...
登录
郭盛
/
areial
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
fcba7b2598aed45f731014704632f3c5fb671fc6
1 个父辈
4180813e
1 个管道 的构建
通过
耗费 1 秒
修改购买次数
变更
3
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
181 行增加
和
117 行删除
.idea/workspace.xml
application/api/controller/Pay.php
application/api/controller/User.php
.idea/workspace.xml
查看文件 @
fcba7b2
...
...
@@ -2,7 +2,8 @@
<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/extra/verify.php"
afterPath=
"$PROJECT_DIR$/application/extra/verify.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/api/controller/Pay.php"
afterPath=
"$PROJECT_DIR$/application/api/controller/Pay.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/api/controller/User.php"
afterPath=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -13,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=
"
tru
e"
>
<file
leaf-file-name=
"User.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/User.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"7"
>
<caret
line=
"389"
column=
"7"
lean-forward=
"false"
selection-start-line=
"389"
selection-start-column=
"7"
selection-end-line=
"389"
selection-end-column=
"7"
/>
<state
relative-caret-position=
"115"
>
<caret
line=
"265"
column=
"25"
lean-forward=
"true"
selection-start-line=
"265"
selection-start-column=
"25"
selection-end-line=
"265"
selection-end-column=
"25"
/>
<folding>
<element
signature=
"e#365#484#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#490#1228#0#PHP"
expanded=
"false"
/>
...
...
@@ -29,49 +30,72 @@
<element
signature=
"e#4973#5810#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5815#8010#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8016#8661#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8666#9762#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9768#10470#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10475#11675#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11681#12257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12262#12809#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12815#13499#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15318#16188#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16193#18401#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18407#18784#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18789#19053#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19059#19564#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19569#19820#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19826#20305#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20310#21067#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21073#21554#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21559#22329#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22335#22698#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22703#22894#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22900#23258#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23263#23453#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23459#24602#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24607#27272#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27278#27776#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27781#29527#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29533#29946#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29951#30430#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30436#30970#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30975#32360#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32366#33020#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33025#34978#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33179#33265#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33354#33442#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34984#35744#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35749#38458#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38484#39315#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39321#39741#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39746#40229#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40235#41041#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41046#44200#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44215#45543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45559#46586#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46592#47350#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47355#49742#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13504#15600#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15606#16476#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16481#18977#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18983#19360#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19365#19629#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19635#20140#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20145#20396#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20402#20881#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20886#21643#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21649#22130#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22135#22905#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22911#23274#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23279#23470#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23476#23834#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23839#24029#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24035#25178#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25183#27848#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27854#28352#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28357#30103#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30109#30522#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30527#31006#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31012#31546#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31551#32936#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32942#33596#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33601#35554#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33755#33841#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33930#34018#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35560#36320#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36325#39034#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39060#39891#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39897#40317#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40322#40805#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40811#41617#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41622#44776#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44791#46119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46135#47162#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47168#47926#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47931#50318#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=
"549"
>
<caret
line=
"502"
column=
"21"
lean-forward=
"false"
selection-start-line=
"502"
selection-start-column=
"21"
selection-end-line=
"502"
selection-end-column=
"21"
/>
<folding>
<element
signature=
"e#450#569#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#575#888#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#893#2938#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2944#3264#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3269#5320#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5326#5744#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9966#10386#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10391#14250#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14277#17979#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18009#20953#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22268#23101#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23124#23341#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -119,20 +143,20 @@
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/vip.js"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/wonderful/add.html"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/wonderful/edit.html"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/Pay.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/lang/zh-cn/video.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/video/add.html"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/video/edit.html"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/pic/edit.html"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/pic/add.html"
/>
<option
value=
"$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/pic.js"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/video.js"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/wonderful.js"
/>
<option
value=
"$PROJECT_DIR$/application/admin/controller/Pic.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/controller/Video.php"
/>
<option
value=
"$PROJECT_DIR$/application/extra/verify.php"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/Pay.php"
/>
</list>
</option>
</component>
...
...
@@ -151,8 +175,8 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"-49"
/>
<option
name=
"y"
value=
"73"
/>
<option
name=
"x"
value=
"134"
/>
<option
name=
"y"
value=
"56"
/>
<option
name=
"width"
value=
"1806"
/>
<option
name=
"height"
value=
"972"
/>
</component>
...
...
@@ -181,6 +205,24 @@
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
...
...
@@ -239,7 +281,7 @@
<workItem
from=
"1574382087071"
duration=
"22007000"
/>
<workItem
from=
"1574410294356"
duration=
"15863000"
/>
<workItem
from=
"1574469667436"
duration=
"25235000"
/>
<workItem
from=
"1574641631900"
duration=
"
4271
000"
/>
<workItem
from=
"1574641631900"
duration=
"
5454
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"调试"
>
<created>
1574145133364
</created>
...
...
@@ -252,7 +294,7 @@
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"20
7316
000"
/>
<option
name=
"totallyTimeSpent"
value=
"20
8499
000"
/>
</component>
<component
name=
"TodoView"
>
<todo-panel
id=
"selected-file"
>
...
...
@@ -264,9 +306,10 @@
</todo-panel>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-49"
y=
"73"
width=
"1806"
height=
"972"
extended-state=
"1"
/>
<frame
x=
"134"
y=
"56"
width=
"1806"
height=
"972"
extended-state=
"1"
/>
<editor
active=
"true"
/>
<layout>
<window_info
id=
"Project"
active=
"
tru
e"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.1517755"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Project"
active=
"
fals
e"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.1517755"
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"
/>
...
...
@@ -457,6 +500,7 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"297"
>
<caret
line=
"25"
column=
"6"
lean-forward=
"false"
selection-start-line=
"25"
selection-start-column=
"6"
selection-end-line=
"25"
selection-end-column=
"6"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -464,6 +508,7 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"411"
>
<caret
line=
"28"
column=
"9"
lean-forward=
"false"
selection-start-line=
"28"
selection-start-column=
"9"
selection-end-line=
"28"
selection-end-column=
"9"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -471,6 +516,7 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"261"
>
<caret
line=
"25"
column=
"58"
lean-forward=
"false"
selection-start-line=
"25"
selection-start-column=
"58"
selection-end-line=
"25"
selection-end-column=
"58"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -586,29 +632,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=
"625"
>
<caret
line=
"247"
column=
"31"
lean-forward=
"false"
selection-start-line=
"247"
selection-start-column=
"31"
selection-end-line=
"247"
selection-end-column=
"31"
/>
<folding>
<element
signature=
"e#450#569#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#575#888#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#893#2938#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2944#3264#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3269#5320#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5326#5744#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5749#9603#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9609#10029#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10034#13893#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13920#17622#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17652#20596#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20625#21455#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21484#22317#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22340#22557#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/assets/js/backend/pic.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"209"
>
...
...
@@ -675,8 +698,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/User.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"7"
>
<caret
line=
"389"
column=
"7"
lean-forward=
"false"
selection-start-line=
"389"
selection-start-column=
"7"
selection-end-line=
"389"
selection-end-column=
"7"
/>
<state
relative-caret-position=
"115"
>
<caret
line=
"265"
column=
"25"
lean-forward=
"true"
selection-start-line=
"265"
selection-start-column=
"25"
selection-end-line=
"265"
selection-end-column=
"25"
/>
<folding>
<element
signature=
"e#365#484#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#490#1228#0#PHP"
expanded=
"false"
/>
...
...
@@ -688,49 +711,70 @@
<element
signature=
"e#4973#5810#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5815#8010#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8016#8661#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8666#9762#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9768#10470#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10475#11675#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11681#12257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12262#12809#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12815#13499#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15318#16188#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16193#18401#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18407#18784#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18789#19053#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19059#19564#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19569#19820#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19826#20305#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20310#21067#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21073#21554#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21559#22329#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22335#22698#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22703#22894#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22900#23258#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23263#23453#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23459#24602#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24607#27272#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27278#27776#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27781#29527#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29533#29946#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29951#30430#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30436#30970#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30975#32360#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32366#33020#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33025#34978#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33179#33265#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33354#33442#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34984#35744#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35749#38458#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38484#39315#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39321#39741#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39746#40229#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40235#41041#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41046#44200#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44215#45543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45559#46586#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46592#47350#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47355#49742#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13504#15600#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15606#16476#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16481#18977#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18983#19360#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19365#19629#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19635#20140#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20145#20396#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20402#20881#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20886#21643#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21649#22130#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22135#22905#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22911#23274#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23279#23470#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23476#23834#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23839#24029#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24035#25178#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25183#27848#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27854#28352#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28357#30103#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30109#30522#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30527#31006#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31012#31546#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31551#32936#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32942#33596#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33601#35554#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33755#33841#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33930#34018#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35560#36320#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36325#39034#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39060#39891#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39897#40317#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40322#40805#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40811#41617#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41622#44776#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44791#46119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46135#47162#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47168#47926#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47931#50318#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=
"549"
>
<caret
line=
"502"
column=
"21"
lean-forward=
"false"
selection-start-line=
"502"
selection-start-column=
"21"
selection-end-line=
"502"
selection-end-column=
"21"
/>
<folding>
<element
signature=
"e#450#569#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#575#888#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#893#2938#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2944#3264#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3269#5320#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5326#5744#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9966#10386#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10391#14250#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14277#17979#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18009#20953#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22268#23101#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23124#23341#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
application/api/controller/Pay.php
查看文件 @
fcba7b2
...
...
@@ -162,6 +162,7 @@ class Pay extends Api
$this
->
error
([
'code'
=>
2
,
'msg'
=>
'openid不能为空'
]);
}
$data
=
Db
::
name
(
'order'
)
->
where
(
'id'
,
$order_id
)
->
find
();
$pic_id
=
explode
(
','
,
$data
[
'pic_id'
]);
if
(
$type
==
1
){
if
(
$data
){
if
(
$data
[
'status'
]
==
2
){
...
...
@@ -177,6 +178,10 @@ class Pay extends Api
// 启动事务
Db
::
startTrans
();
try
{
foreach
(
$pic_id
as
$key
=>
$v
){
$pic
=
Db
::
name
(
'pic'
)
->
field
(
'id,buy_num'
)
->
where
(
'id'
,
$v
)
->
find
();
Db
::
name
(
'pic'
)
->
where
(
'id'
,
$pic
[
'id'
])
->
update
([
'buy_num'
=>
$pic
[
'buy_num'
]
+
1
]);
}
$arr
=
Db
::
name
(
'user'
)
->
where
(
'id'
,
$data
[
'user_id'
])
->
update
([
'money'
=>
$money
]);
$res
=
Db
::
name
(
'order'
)
->
where
(
'id'
,
$order_id
)
->
update
([
'status'
=>
2
,
'paytime'
=>
time
()]);
if
(
$res
&&
$arr
){
...
...
@@ -489,6 +494,13 @@ class Pay extends Api
//支付成功,更新订单状态
$toporder
[
'status'
]
=
2
;
$toporder
[
'paytime'
]
=
time
();
$data
=
Db
::
name
(
'order'
)
->
where
(
'id'
,
$message
[
'out_trade_no'
])
->
find
();
$pic_id
=
explode
(
','
,
$data
[
'pic_id'
]);
foreach
(
$pic_id
as
$key
=>
$v
){
$pic
=
Db
::
name
(
'pic'
)
->
field
(
'id,buy_num'
)
->
where
(
'id'
,
$v
)
->
find
();
Db
::
name
(
'pic'
)
->
where
(
'id'
,
$pic
[
'id'
])
->
update
([
'buy_num'
=>
$pic
[
'buy_num'
]
+
1
]);
}
}
else
{
//支付失败
$toporder
[
'status'
]
=
1
;
...
...
application/api/controller/User.php
查看文件 @
fcba7b2
...
...
@@ -426,12 +426,14 @@ class User extends Api
$this
->
error
([
'code'
=>
2
,
'msg'
=>
'缺少必要参数'
]);
}
$data
=
Db
::
name
(
'pic'
)
->
field
(
'id,title,thumbnail,price,water_url,url,code,content'
)
->
field
(
'id,title,thumbnail,price,water_url,url,code,content
,click_num
'
)
->
where
(
'id'
,
$pic_id
)
->
find
();
if
(
empty
(
$data
)){
$this
->
error
([
'code'
=>
2
,
'msg'
=>
'参数错误'
]);
}
$click_num
=
$data
[
'click_num'
]
+
1
;
Db
::
name
(
'pic'
)
->
where
(
'id'
,
$pic_id
)
->
update
([
'click_num'
=>
$click_num
]);
$data
[
'water_url'
]
=
$rule
.
$data
[
'water_url'
];
$data
[
'vip_price'
]
=
$data
[
'price'
]
*
0.75
;
$data
[
'thumbnail'
]
=
$rule
.
$data
[
'thumbnail'
];
...
...
@@ -444,12 +446,14 @@ class User extends Api
$this
->
error
([
'code'
=>
2
,
'msg'
=>
'缺少必要参数'
]);
}
$data
=
Db
::
name
(
'pic'
)
->
field
(
'id,title,thumbnail,price,water_url,url,code,content'
)
->
field
(
'id,title,thumbnail,price,water_url,url,code,content
,click_num
'
)
->
where
(
'id'
,
$pic_id
)
->
find
();
if
(
empty
(
$data
)){
$this
->
error
([
'code'
=>
2
,
'msg'
=>
'参数错误'
]);
}
$click_num
=
$data
[
'click_num'
]
+
1
;
Db
::
name
(
'pic'
)
->
where
(
'id'
,
$pic_id
)
->
update
([
'click_num'
=>
$click_num
]);
$data
[
'is_vip'
]
=
1
;
$data
[
'water_url'
]
=
$rule
.
$data
[
'water_url'
];
$data
[
'vip_price'
]
=
$data
[
'price'
]
*
0.75
;
...
...
@@ -502,12 +506,14 @@ class User extends Api
$this
->
error
([
'code'
=>
2
,
'msg'
=>
'缺少必要参数'
]);
}
$data
=
Db
::
name
(
'video'
)
->
field
(
'id,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,four_url,two_code,four_code,eight_code,eight_url,content'
)
->
field
(
'id,
click_num,
title,thumbnail,video,price,four_price,eight_price,water_url,two_url,four_url,two_code,four_code,eight_code,eight_url,content'
)
->
where
(
'id'
,
$pic_id
)
->
find
();
if
(
empty
(
$data
)){
$this
->
error
([
'code'
=>
2
,
'msg'
=>
'参数错误'
]);
}
$click_num
=
$data
[
'click_num'
]
+
1
;
Db
::
name
(
'video'
)
->
where
(
'id'
,
$pic_id
)
->
update
([
'click_num'
=>
$click_num
]);
$data
[
'vip_price'
]
=
$data
[
'price'
]
*
0.75
;
$data
[
'four_vipprice'
]
=
$data
[
'four_price'
]
*
0.75
;
$data
[
'eight_vipprice'
]
=
$data
[
'eight_price'
]
*
0.75
;
...
...
@@ -522,12 +528,14 @@ class User extends Api
$this
->
error
([
'code'
=>
2
,
'msg'
=>
'缺少必要参数'
]);
}
$data
=
Db
::
name
(
'video'
)
->
field
(
'id,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,two_code,four_code,eight_code,four_url,eight_url,content'
)
->
field
(
'id,
click_num,
title,thumbnail,video,price,four_price,eight_price,water_url,two_url,two_code,four_code,eight_code,four_url,eight_url,content'
)
->
where
(
'id'
,
$pic_id
)
->
find
();
if
(
empty
(
$data
)){
$this
->
error
([
'code'
=>
2
,
'msg'
=>
'参数错误'
]);
}
$click_num
=
$data
[
'click_num'
]
+
1
;
Db
::
name
(
'video'
)
->
where
(
'id'
,
$pic_id
)
->
update
([
'click_num'
=>
$click_num
]);
$data
[
'is_vip'
]
=
1
;
$data
[
'vip_price'
]
=
$data
[
'price'
]
*
0.75
;
$data
[
'four_vipprice'
]
=
$data
[
'four_price'
]
*
0.75
;
...
...
请
注册
或
登录
后发表评论