切换导航条
此项目
正在载入...
登录
郭盛
/
scrap
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
8a1a32d4f61ade395d8a86b818e26947dbb2b414
1 个父辈
f02d576c
1 个管道 的构建
通过
耗费 0 秒
修改积分
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
89 行增加
和
90 行删除
.idea/workspace.xml
api/index/controller/UserController.php
.idea/workspace.xml
查看文件 @
8a1a32d
...
...
@@ -2,7 +2,6 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"0011664b-87e9-41bd-9f37-18792fb15777"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<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"
/>
...
...
@@ -28,8 +27,8 @@
<file
leaf-file-name=
"UserController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/UserController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"254"
>
<caret
line=
"494"
column=
"25"
lean-forward=
"true"
selection-start-line=
"494"
selection-start-column=
"25"
selection-end-line=
"494"
selection-end-column=
"25"
/>
<state
relative-caret-position=
"604"
>
<caret
line=
"505"
column=
"72"
lean-forward=
"false"
selection-start-line=
"505"
selection-start-column=
"72"
selection-end-line=
"505"
selection-end-column=
"72"
/>
<folding>
<element
signature=
"e#366#791#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#796#1608#0#PHP"
expanded=
"false"
/>
...
...
@@ -55,47 +54,47 @@
<element
signature=
"e#11571#11859#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11864#12803#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12809#13390#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15047#15503#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15508#17576#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17599#17954#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17960#18673#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18678#20135#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20141#20602#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20607#23734#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23740#24349#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24354#25639#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25645#26002#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26007#26990#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26996#27348#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27353#28462#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28468#28823#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28828#30255#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30261#30685#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30690#31301#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31307#31803#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31808#35288#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32610#33737#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35294#35578#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35583#36219#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36240#36559#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36565#36973#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36979#37738#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37757#38621#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38647#39047#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39070#39643#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39666#40476#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40482#41081#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41086#42050#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42056#42723#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42728#43769#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43775#44438#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44443#45470#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45477#45908#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45913#46491#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46497#46926#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46931#47533#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47539#47966#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47971#48537#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15025#15481#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15486#17554#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17577#17932#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17938#18651#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18656#20113#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20119#20580#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20585#23712#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23718#24327#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24332#25617#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25623#25980#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25985#26968#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26974#27326#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27331#28440#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28446#28801#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28806#30233#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30239#30663#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30668#31279#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31285#31781#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31786#35266#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32588#33715#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35272#35556#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35561#36197#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36218#36537#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36543#36951#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36957#37716#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37735#38599#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38625#39025#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39048#39621#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39644#40454#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40460#41059#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41064#42028#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42034#42701#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42706#43747#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43753#44416#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44421#45448#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45455#45886#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45891#46469#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46475#46904#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46909#47511#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47517#47944#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47949#48515#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -355,12 +354,12 @@
<workItem
from=
"1576110549014"
duration=
"12973000"
/>
<workItem
from=
"1576213939457"
duration=
"999000"
/>
<workItem
from=
"1576215244804"
duration=
"6841000"
/>
<workItem
from=
"1576298110450"
duration=
"
5727
000"
/>
<workItem
from=
"1576298110450"
duration=
"
6172
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"5
69815
000"
/>
<option
name=
"totallyTimeSpent"
value=
"5
70260
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"122"
y=
"112"
width=
"1618"
height=
"1100"
extended-state=
"1"
/>
...
...
@@ -782,8 +781,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/UserController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"254"
>
<caret
line=
"494"
column=
"25"
lean-forward=
"true"
selection-start-line=
"494"
selection-start-column=
"25"
selection-end-line=
"494"
selection-end-column=
"25"
/>
<state
relative-caret-position=
"604"
>
<caret
line=
"505"
column=
"72"
lean-forward=
"false"
selection-start-line=
"505"
selection-start-column=
"72"
selection-end-line=
"505"
selection-end-column=
"72"
/>
<folding>
<element
signature=
"e#366#791#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#796#1608#0#PHP"
expanded=
"false"
/>
...
...
@@ -809,47 +808,47 @@
<element
signature=
"e#11571#11859#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11864#12803#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12809#13390#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15047#15503#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15508#17576#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17599#17954#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17960#18673#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18678#20135#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20141#20602#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20607#23734#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23740#24349#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24354#25639#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25645#26002#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26007#26990#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26996#27348#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27353#28462#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28468#28823#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28828#30255#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30261#30685#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30690#31301#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31307#31803#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31808#35288#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32610#33737#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35294#35578#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35583#36219#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36240#36559#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36565#36973#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36979#37738#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37757#38621#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38647#39047#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39070#39643#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39666#40476#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40482#41081#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41086#42050#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42056#42723#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42728#43769#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43775#44438#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44443#45470#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45477#45908#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45913#46491#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46497#46926#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46931#47533#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47539#47966#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47971#48537#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15025#15481#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15486#17554#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17577#17932#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17938#18651#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18656#20113#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20119#20580#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20585#23712#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23718#24327#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24332#25617#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25623#25980#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25985#26968#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26974#27326#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27331#28440#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28446#28801#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28806#30233#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30239#30663#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30668#31279#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31285#31781#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31786#35266#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32588#33715#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35272#35556#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35561#36197#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36218#36537#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36543#36951#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36957#37716#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37735#38599#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38625#39025#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39048#39621#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39644#40454#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40460#41059#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41064#42028#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42034#42701#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42706#43747#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43753#44416#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44421#45448#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45455#45886#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45891#46469#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46475#46904#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46909#47511#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47517#47944#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47949#48515#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/UserController.php
查看文件 @
8a1a32d
...
...
@@ -503,7 +503,7 @@ class UserController extends RestBaseController
$data
[
'serve'
]
=
$serve
[
'fee'
];
}
else
{
$data
[
'serve'
]
=
$res
[
'fee'
];
$data
[
'get_integral'
]
=
$res
[
'get_integral'
]
-
(
ceil
(
$res
[
'get_integral'
]
*
(
5
/
100
)))
;
$data
[
'get_integral'
]
=
$res
[
'get_integral'
]
-
$data
[
'serve'
]
;
}
$this
->
success
(
'SUCCESS'
,
$data
);
...
...
请
注册
或
登录
后发表评论