郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 490de3d26d7b45a8ae33e1be268912d67764d753 1 个父辈 ce100c70
1 个管道 的构建 通过 耗费 1 秒

修改服务费

内嵌 并排对比
正在显示 2 个修改的文件 包含 96 行增加 和 93 行删除
... ... @@ -2,6 +2,7 @@
<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" />
... ... @@ -27,8 +28,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="180">
<caret line="812" column="29" lean-forward="false" selection-start-line="812" selection-start-column="29" selection-end-line="812" selection-end-column="29" />
<state relative-caret-position="230">
<caret line="528" column="7" lean-forward="true" selection-start-line="528" selection-start-column="7" selection-end-line="528" selection-end-column="7" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
... ... @@ -54,47 +55,48 @@
<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#15023#0#PHP" expanded="false" />
<element signature="e#15029#15485#0#PHP" expanded="false" />
<element signature="e#15490#17558#0#PHP" expanded="false" />
<element signature="e#17581#17936#0#PHP" expanded="false" />
<element signature="e#17942#18655#0#PHP" expanded="false" />
<element signature="e#18660#20117#0#PHP" expanded="false" />
<element signature="e#20123#20584#0#PHP" expanded="false" />
<element signature="e#20589#23716#0#PHP" expanded="false" />
<element signature="e#23722#24331#0#PHP" expanded="false" />
<element signature="e#24336#25621#0#PHP" expanded="false" />
<element signature="e#25627#25984#0#PHP" expanded="false" />
<element signature="e#25989#26972#0#PHP" expanded="false" />
<element signature="e#26978#27330#0#PHP" expanded="false" />
<element signature="e#28450#28805#0#PHP" expanded="false" />
<element signature="e#28810#30237#0#PHP" expanded="false" />
<element signature="e#30243#30667#0#PHP" expanded="false" />
<element signature="e#30672#31283#0#PHP" expanded="false" />
<element signature="e#31289#31785#0#PHP" expanded="false" />
<element signature="e#31790#35152#0#PHP" expanded="false" />
<element signature="e#32592#33719#0#PHP" expanded="false" />
<element signature="e#35158#35442#0#PHP" expanded="false" />
<element signature="e#35447#36083#0#PHP" expanded="false" />
<element signature="e#36104#36423#0#PHP" expanded="false" />
<element signature="e#36429#36837#0#PHP" expanded="false" />
<element signature="e#36843#37602#0#PHP" expanded="false" />
<element signature="e#37621#38485#0#PHP" expanded="false" />
<element signature="e#38511#38911#0#PHP" expanded="false" />
<element signature="e#38934#39507#0#PHP" expanded="false" />
<element signature="e#39530#40340#0#PHP" expanded="false" />
<element signature="e#40346#40945#0#PHP" expanded="false" />
<element signature="e#40950#41914#0#PHP" expanded="false" />
<element signature="e#41920#42587#0#PHP" expanded="false" />
<element signature="e#42592#43633#0#PHP" expanded="false" />
<element signature="e#43639#44302#0#PHP" expanded="false" />
<element signature="e#44307#45334#0#PHP" expanded="false" />
<element signature="e#45341#45772#0#PHP" expanded="false" />
<element signature="e#45777#46355#0#PHP" expanded="false" />
<element signature="e#46361#46790#0#PHP" expanded="false" />
<element signature="e#46795#47397#0#PHP" expanded="false" />
<element signature="e#47403#47830#0#PHP" expanded="false" />
<element signature="e#47835#48401#0#PHP" expanded="false" />
<element signature="e#13395#15063#0#PHP" expanded="false" />
<element signature="e#15069#15525#0#PHP" expanded="false" />
<element signature="e#15530#17598#0#PHP" expanded="false" />
<element signature="e#17621#17976#0#PHP" expanded="false" />
<element signature="e#17982#18695#0#PHP" expanded="false" />
<element signature="e#18700#20157#0#PHP" expanded="false" />
<element signature="e#20163#20624#0#PHP" expanded="false" />
<element signature="e#20629#23756#0#PHP" expanded="false" />
<element signature="e#23762#24371#0#PHP" expanded="false" />
<element signature="e#24376#25661#0#PHP" expanded="false" />
<element signature="e#25667#26024#0#PHP" expanded="false" />
<element signature="e#26029#27012#0#PHP" expanded="false" />
<element signature="e#27018#27370#0#PHP" expanded="false" />
<element signature="e#27375#28484#0#PHP" expanded="false" />
<element signature="e#28490#28845#0#PHP" expanded="false" />
<element signature="e#28850#30277#0#PHP" expanded="false" />
<element signature="e#30283#30707#0#PHP" expanded="false" />
<element signature="e#30712#31323#0#PHP" expanded="false" />
<element signature="e#31329#31825#0#PHP" expanded="false" />
<element signature="e#31830#35192#0#PHP" expanded="false" />
<element signature="e#32632#33759#0#PHP" expanded="false" />
<element signature="e#35198#35482#0#PHP" expanded="false" />
<element signature="e#35487#36123#0#PHP" expanded="false" />
<element signature="e#36144#36463#0#PHP" expanded="false" />
<element signature="e#36469#36877#0#PHP" expanded="false" />
<element signature="e#36883#37642#0#PHP" expanded="false" />
<element signature="e#37661#38525#0#PHP" expanded="false" />
<element signature="e#38551#38951#0#PHP" expanded="false" />
<element signature="e#38974#39547#0#PHP" expanded="false" />
<element signature="e#39570#40380#0#PHP" expanded="false" />
<element signature="e#40386#40985#0#PHP" expanded="false" />
<element signature="e#40990#41954#0#PHP" expanded="false" />
<element signature="e#41960#42627#0#PHP" expanded="false" />
<element signature="e#42632#43673#0#PHP" expanded="false" />
<element signature="e#43679#44342#0#PHP" expanded="false" />
<element signature="e#44347#45374#0#PHP" expanded="false" />
<element signature="e#45381#45812#0#PHP" expanded="false" />
<element signature="e#45817#46395#0#PHP" expanded="false" />
<element signature="e#46401#46830#0#PHP" expanded="false" />
<element signature="e#46835#47437#0#PHP" expanded="false" />
<element signature="e#47443#47870#0#PHP" expanded="false" />
<element signature="e#47875#48441#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -189,8 +191,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="371" />
<option name="y" value="37" />
<option name="x" value="404" />
<option name="y" value="72" />
<option name="width" value="1618" />
<option name="height" value="1007" />
</component>
... ... @@ -351,15 +353,15 @@
<workItem from="1576049946357" duration="1233000" />
<workItem from="1576056936489" duration="7947000" />
<workItem from="1576066696521" duration="5462000" />
<workItem from="1576110549014" duration="3202000" />
<workItem from="1576110549014" duration="3737000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="546477000" />
<option name="totallyTimeSpent" value="547012000" />
</component>
<component name="ToolWindowManager">
<frame x="371" y="37" width="1618" height="1007" extended-state="0" />
<frame x="404" y="72" width="1618" height="1007" 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.1508344" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -834,8 +836,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="812" column="29" lean-forward="false" selection-start-line="812" selection-start-column="29" selection-end-line="812" selection-end-column="29" />
<state relative-caret-position="230">
<caret line="528" column="7" lean-forward="true" selection-start-line="528" selection-start-column="7" selection-end-line="528" selection-end-column="7" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
... ... @@ -861,47 +863,48 @@
<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#15023#0#PHP" expanded="false" />
<element signature="e#15029#15485#0#PHP" expanded="false" />
<element signature="e#15490#17558#0#PHP" expanded="false" />
<element signature="e#17581#17936#0#PHP" expanded="false" />
<element signature="e#17942#18655#0#PHP" expanded="false" />
<element signature="e#18660#20117#0#PHP" expanded="false" />
<element signature="e#20123#20584#0#PHP" expanded="false" />
<element signature="e#20589#23716#0#PHP" expanded="false" />
<element signature="e#23722#24331#0#PHP" expanded="false" />
<element signature="e#24336#25621#0#PHP" expanded="false" />
<element signature="e#25627#25984#0#PHP" expanded="false" />
<element signature="e#25989#26972#0#PHP" expanded="false" />
<element signature="e#26978#27330#0#PHP" expanded="false" />
<element signature="e#28450#28805#0#PHP" expanded="false" />
<element signature="e#28810#30237#0#PHP" expanded="false" />
<element signature="e#30243#30667#0#PHP" expanded="false" />
<element signature="e#30672#31283#0#PHP" expanded="false" />
<element signature="e#31289#31785#0#PHP" expanded="false" />
<element signature="e#31790#35152#0#PHP" expanded="false" />
<element signature="e#32592#33719#0#PHP" expanded="false" />
<element signature="e#35158#35442#0#PHP" expanded="false" />
<element signature="e#35447#36083#0#PHP" expanded="false" />
<element signature="e#36104#36423#0#PHP" expanded="false" />
<element signature="e#36429#36837#0#PHP" expanded="false" />
<element signature="e#36843#37602#0#PHP" expanded="false" />
<element signature="e#37621#38485#0#PHP" expanded="false" />
<element signature="e#38511#38911#0#PHP" expanded="false" />
<element signature="e#38934#39507#0#PHP" expanded="false" />
<element signature="e#39530#40340#0#PHP" expanded="false" />
<element signature="e#40346#40945#0#PHP" expanded="false" />
<element signature="e#40950#41914#0#PHP" expanded="false" />
<element signature="e#41920#42587#0#PHP" expanded="false" />
<element signature="e#42592#43633#0#PHP" expanded="false" />
<element signature="e#43639#44302#0#PHP" expanded="false" />
<element signature="e#44307#45334#0#PHP" expanded="false" />
<element signature="e#45341#45772#0#PHP" expanded="false" />
<element signature="e#45777#46355#0#PHP" expanded="false" />
<element signature="e#46361#46790#0#PHP" expanded="false" />
<element signature="e#46795#47397#0#PHP" expanded="false" />
<element signature="e#47403#47830#0#PHP" expanded="false" />
<element signature="e#47835#48401#0#PHP" expanded="false" />
<element signature="e#13395#15063#0#PHP" expanded="false" />
<element signature="e#15069#15525#0#PHP" expanded="false" />
<element signature="e#15530#17598#0#PHP" expanded="false" />
<element signature="e#17621#17976#0#PHP" expanded="false" />
<element signature="e#17982#18695#0#PHP" expanded="false" />
<element signature="e#18700#20157#0#PHP" expanded="false" />
<element signature="e#20163#20624#0#PHP" expanded="false" />
<element signature="e#20629#23756#0#PHP" expanded="false" />
<element signature="e#23762#24371#0#PHP" expanded="false" />
<element signature="e#24376#25661#0#PHP" expanded="false" />
<element signature="e#25667#26024#0#PHP" expanded="false" />
<element signature="e#26029#27012#0#PHP" expanded="false" />
<element signature="e#27018#27370#0#PHP" expanded="false" />
<element signature="e#27375#28484#0#PHP" expanded="false" />
<element signature="e#28490#28845#0#PHP" expanded="false" />
<element signature="e#28850#30277#0#PHP" expanded="false" />
<element signature="e#30283#30707#0#PHP" expanded="false" />
<element signature="e#30712#31323#0#PHP" expanded="false" />
<element signature="e#31329#31825#0#PHP" expanded="false" />
<element signature="e#31830#35192#0#PHP" expanded="false" />
<element signature="e#32632#33759#0#PHP" expanded="false" />
<element signature="e#35198#35482#0#PHP" expanded="false" />
<element signature="e#35487#36123#0#PHP" expanded="false" />
<element signature="e#36144#36463#0#PHP" expanded="false" />
<element signature="e#36469#36877#0#PHP" expanded="false" />
<element signature="e#36883#37642#0#PHP" expanded="false" />
<element signature="e#37661#38525#0#PHP" expanded="false" />
<element signature="e#38551#38951#0#PHP" expanded="false" />
<element signature="e#38974#39547#0#PHP" expanded="false" />
<element signature="e#39570#40380#0#PHP" expanded="false" />
<element signature="e#40386#40985#0#PHP" expanded="false" />
<element signature="e#40990#41954#0#PHP" expanded="false" />
<element signature="e#41960#42627#0#PHP" expanded="false" />
<element signature="e#42632#43673#0#PHP" expanded="false" />
<element signature="e#43679#44342#0#PHP" expanded="false" />
<element signature="e#44347#45374#0#PHP" expanded="false" />
<element signature="e#45381#45812#0#PHP" expanded="false" />
<element signature="e#45817#46395#0#PHP" expanded="false" />
<element signature="e#46401#46830#0#PHP" expanded="false" />
<element signature="e#46835#47437#0#PHP" expanded="false" />
<element signature="e#47443#47870#0#PHP" expanded="false" />
<element signature="e#47875#48441#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -497,13 +497,13 @@ class UserController extends RestBaseController
$data['sub_time'] = $res['sub_time'];
$data['image'] = explode(',',$res['image']);
$data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($res['content']));
$data['get_integral'] = $res['get_integral'];
$serve = Db::name('recyclefee')->where('id',1)->field('fee')->find();
$data['status'] = $res['status'];
if($data['status'] == 1 || $data['status'] == 0){
$data['serve'] = $serve['fee'];
}else{
$data['serve'] = ceil($data['get_integral']*(5/100));
$data['get_integral'] = $res['get_integral']-(ceil($res['get_integral']*(5/100)));
$data['serve'] = ceil($res['get_integral']*(5/100));
}
$this->success('SUCCESS',$data);
}
... ...