郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 e98d9c2f60004e716ca72ddcb5957c5dbc4e4cb2 1 个父辈 7dec1885
1 个管道 的构建 通过 耗费 1 秒

修改累计积分问题

内嵌 并排对比
正在显示 2 个修改的文件 包含 54 行增加 和 51 行删除
... ... @@ -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="-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" />
<state relative-caret-position="281">
<caret line="1007" column="7" lean-forward="true" selection-start-line="1007" selection-start-column="7" selection-end-line="1007" selection-end-column="7" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
... ... @@ -73,28 +74,29 @@
<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#35497#0#PHP" expanded="false" />
<element signature="e#32588#33715#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" />
<element signature="e#35503#35787#0#PHP" expanded="false" />
<element signature="e#35792#36428#0#PHP" expanded="false" />
<element signature="e#36449#36768#0#PHP" expanded="false" />
<element signature="e#36774#37182#0#PHP" expanded="false" />
<element signature="e#37188#37947#0#PHP" expanded="false" />
<element signature="e#37966#38830#0#PHP" expanded="false" />
<element signature="e#38856#39256#0#PHP" expanded="false" />
<element signature="e#39279#39852#0#PHP" expanded="false" />
<element signature="e#39875#40685#0#PHP" expanded="false" />
<element signature="e#40691#41290#0#PHP" expanded="false" />
<element signature="e#41295#42259#0#PHP" expanded="false" />
<element signature="e#42265#42932#0#PHP" expanded="false" />
<element signature="e#42937#43978#0#PHP" expanded="false" />
<element signature="e#43984#44647#0#PHP" expanded="false" />
<element signature="e#44652#45679#0#PHP" expanded="false" />
<element signature="e#45686#46117#0#PHP" expanded="false" />
<element signature="e#46122#46700#0#PHP" expanded="false" />
<element signature="e#46706#47135#0#PHP" expanded="false" />
<element signature="e#47140#47742#0#PHP" expanded="false" />
<element signature="e#47748#48175#0#PHP" expanded="false" />
<element signature="e#48180#48746#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -188,7 +190,7 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="231" />
<option name="y" value="49" />
<option name="width" value="1618" />
... ... @@ -354,15 +356,15 @@
<workItem from="1576110549014" duration="12973000" />
<workItem from="1576213939457" duration="999000" />
<workItem from="1576215244804" duration="6841000" />
<workItem from="1576298110450" duration="6835000" />
<workItem from="1576298110450" duration="7028000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="570923000" />
<option name="totallyTimeSpent" value="571116000" />
</component>
<component name="ToolWindowManager">
<frame x="231" y="49" width="1618" height="1098" extended-state="0" />
<frame x="231" y="49" width="1618" height="1098" 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.18870346" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -781,8 +783,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state relative-caret-position="281">
<caret line="1007" column="7" lean-forward="true" selection-start-line="1007" selection-start-column="7" selection-end-line="1007" selection-end-column="7" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
... ... @@ -827,28 +829,29 @@
<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#35497#0#PHP" expanded="false" />
<element signature="e#32588#33715#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" />
<element signature="e#35503#35787#0#PHP" expanded="false" />
<element signature="e#35792#36428#0#PHP" expanded="false" />
<element signature="e#36449#36768#0#PHP" expanded="false" />
<element signature="e#36774#37182#0#PHP" expanded="false" />
<element signature="e#37188#37947#0#PHP" expanded="false" />
<element signature="e#37966#38830#0#PHP" expanded="false" />
<element signature="e#38856#39256#0#PHP" expanded="false" />
<element signature="e#39279#39852#0#PHP" expanded="false" />
<element signature="e#39875#40685#0#PHP" expanded="false" />
<element signature="e#40691#41290#0#PHP" expanded="false" />
<element signature="e#41295#42259#0#PHP" expanded="false" />
<element signature="e#42265#42932#0#PHP" expanded="false" />
<element signature="e#42937#43978#0#PHP" expanded="false" />
<element signature="e#43984#44647#0#PHP" expanded="false" />
<element signature="e#44652#45679#0#PHP" expanded="false" />
<element signature="e#45686#46117#0#PHP" expanded="false" />
<element signature="e#46122#46700#0#PHP" expanded="false" />
<element signature="e#46706#47135#0#PHP" expanded="false" />
<element signature="e#47140#47742#0#PHP" expanded="false" />
<element signature="e#47748#48175#0#PHP" expanded="false" />
<element signature="e#48180#48746#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1081,7 +1081,7 @@ class UserController extends RestBaseController
$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['add_total'] = $info['add_total'] + ($get_integral - $sub['fee']);
$res['now_integral'] = $info['now_integral'] + ($get_integral - $sub['fee']);
}
$detail['create_time'] = time();
... ...