切换导航条
此项目
正在载入...
登录
郭盛
/
scrap
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
7dec1885a2a7316cc1029efe29a3ae660ffacb38
1 个父辈
8a1a32d4
1 个管道 的构建
通过
耗费 0 秒
修改增加用户积分问题
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
62 行增加
和
58 行删除
.idea/workspace.xml
api/index/controller/UserController.php
.idea/workspace.xml
查看文件 @
7dec188
...
...
@@ -27,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=
"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"
/>
<state
relative-caret-position=
"-293"
>
<caret
line=
"1080"
column=
"79"
lean-forward=
"true"
selection-start-line=
"1080"
selection-start-column=
"79"
selection-end-line=
"1080"
selection-end-column=
"79"
/>
<folding>
<element
signature=
"e#366#791#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#796#1608#0#PHP"
expanded=
"false"
/>
...
...
@@ -54,6 +54,7 @@
<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#13395#15019#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"
/>
...
...
@@ -72,29 +73,28 @@
<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"
/>
<element
signature=
"e#35487#35771#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35776#36412#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36433#36752#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36758#37166#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37172#37931#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37950#38814#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38840#39240#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39263#39836#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39859#40669#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40675#41274#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41279#42243#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42249#42916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42921#43962#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43968#44631#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44636#45663#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45670#46101#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46106#46684#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46690#47119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47124#47726#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47732#48159#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48164#48730#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -188,11 +188,11 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"122"
/>
<option
name=
"y"
value=
"112"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"231"
/>
<option
name=
"y"
value=
"49"
/>
<option
name=
"width"
value=
"1618"
/>
<option
name=
"height"
value=
"1
100
"
/>
<option
name=
"height"
value=
"1
098
"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -354,15 +354,15 @@
<workItem
from=
"1576110549014"
duration=
"12973000"
/>
<workItem
from=
"1576213939457"
duration=
"999000"
/>
<workItem
from=
"1576215244804"
duration=
"6841000"
/>
<workItem
from=
"1576298110450"
duration=
"6
172
000"
/>
<workItem
from=
"1576298110450"
duration=
"6
835
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"570
260
000"
/>
<option
name=
"totallyTimeSpent"
value=
"570
923
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
122"
y=
"112"
width=
"1618"
height=
"1100"
extended-state=
"1
"
/>
<frame
x=
"
231"
y=
"49"
width=
"1618"
height=
"1098"
extended-state=
"0
"
/>
<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.18870346"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -781,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=
"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"
/>
<state
relative-caret-position=
"-293"
>
<caret
line=
"1080"
column=
"79"
lean-forward=
"true"
selection-start-line=
"1080"
selection-start-column=
"79"
selection-end-line=
"1080"
selection-end-column=
"79"
/>
<folding>
<element
signature=
"e#366#791#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#796#1608#0#PHP"
expanded=
"false"
/>
...
...
@@ -808,6 +808,7 @@
<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#13395#15019#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"
/>
...
...
@@ -826,29 +827,28 @@
<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"
/>
<element
signature=
"e#35487#35771#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35776#36412#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36433#36752#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36758#37166#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37172#37931#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37950#38814#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38840#39240#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39263#39836#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39859#40669#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40675#41274#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41279#42243#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42249#42916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42921#43962#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43968#44631#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44636#45663#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45670#46101#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46106#46684#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46690#47119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47124#47726#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47732#48159#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48164#48730#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/UserController.php
查看文件 @
7dec188
...
...
@@ -1061,9 +1061,7 @@ class UserController extends RestBaseController
}
}
$res
[
'num'
]
=
$info
[
'num'
]
+
1
;
$res
[
'add_total'
]
=
$info
[
'add_total'
]
+
$get_integral
;
$res
[
'now_integral'
]
=
$info
[
'now_integral'
]
+
$get_integral
;
//添加对应的积分明细
$detail
[
'user_id'
]
=
$order
[
'user_id'
];
...
...
@@ -1075,10 +1073,16 @@ class UserController extends RestBaseController
//没有服务费
$detail
[
'total'
]
=
$get_integral
;
$sub
[
'fee'
]
=
0
;
$res
[
'num'
]
=
$info
[
'num'
]
+
1
;
$res
[
'add_total'
]
=
$info
[
'add_total'
]
+
$get_integral
;
$res
[
'now_integral'
]
=
$info
[
'now_integral'
]
+
$get_integral
;
}
else
{
//有服务费
$detail
[
'total'
]
=
$get_integral
-
(
$get_integral
*
(
$fee
[
'fee'
]
/
100
));
$sub
[
'fee'
]
=
$get_integral
*
(
$fee
[
'fee'
]
/
100
);
$res
[
'num'
]
=
$info
[
'num'
]
+
1
;
$res
[
'add_total'
]
=
$info
[
'add_total'
]
+
$get_integral
;
$res
[
'now_integral'
]
=
$info
[
'now_integral'
]
+
(
$get_integral
-
$sub
[
'fee'
]);
}
$detail
[
'create_time'
]
=
time
();
$detail
[
'type'
]
=
5
;
...
...
请
注册
或
登录
后发表评论