郭盛 / scrap · 提交

转到一个项目

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

修改累计积分问题

内嵌 并排对比
正在显示 2 个修改的文件 包含 54 行增加 和 51 行删除
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
  5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
6 </list> 7 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -27,8 +28,8 @@ @@ -27,8 +28,8 @@
27 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true"> 28 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
28 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 29 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
29 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
30 - <state relative-caret-position="-293">  
31 - <caret line="1080" column="79" lean-forward="true" selection-start-line="1080" selection-start-column="79" selection-end-line="1080" selection-end-column="79" /> 31 + <state relative-caret-position="281">
  32 + <caret line="1007" column="7" lean-forward="true" selection-start-line="1007" selection-start-column="7" selection-end-line="1007" selection-end-column="7" />
32 <folding> 33 <folding>
33 <element signature="e#366#791#0#PHP" expanded="false" /> 34 <element signature="e#366#791#0#PHP" expanded="false" />
34 <element signature="e#796#1608#0#PHP" expanded="false" /> 35 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -73,28 +74,29 @@ @@ -73,28 +74,29 @@
73 <element signature="e#30239#30663#0#PHP" expanded="false" /> 74 <element signature="e#30239#30663#0#PHP" expanded="false" />
74 <element signature="e#30668#31279#0#PHP" expanded="false" /> 75 <element signature="e#30668#31279#0#PHP" expanded="false" />
75 <element signature="e#31285#31781#0#PHP" expanded="false" /> 76 <element signature="e#31285#31781#0#PHP" expanded="false" />
  77 + <element signature="e#31786#35497#0#PHP" expanded="false" />
76 <element signature="e#32588#33715#0#PHP" expanded="false" /> 78 <element signature="e#32588#33715#0#PHP" expanded="false" />
77 - <element signature="e#35487#35771#0#PHP" expanded="false" />  
78 - <element signature="e#35776#36412#0#PHP" expanded="false" />  
79 - <element signature="e#36433#36752#0#PHP" expanded="false" />  
80 - <element signature="e#36758#37166#0#PHP" expanded="false" />  
81 - <element signature="e#37172#37931#0#PHP" expanded="false" />  
82 - <element signature="e#37950#38814#0#PHP" expanded="false" />  
83 - <element signature="e#38840#39240#0#PHP" expanded="false" />  
84 - <element signature="e#39263#39836#0#PHP" expanded="false" />  
85 - <element signature="e#39859#40669#0#PHP" expanded="false" />  
86 - <element signature="e#40675#41274#0#PHP" expanded="false" />  
87 - <element signature="e#41279#42243#0#PHP" expanded="false" />  
88 - <element signature="e#42249#42916#0#PHP" expanded="false" />  
89 - <element signature="e#42921#43962#0#PHP" expanded="false" />  
90 - <element signature="e#43968#44631#0#PHP" expanded="false" />  
91 - <element signature="e#44636#45663#0#PHP" expanded="false" />  
92 - <element signature="e#45670#46101#0#PHP" expanded="false" />  
93 - <element signature="e#46106#46684#0#PHP" expanded="false" />  
94 - <element signature="e#46690#47119#0#PHP" expanded="false" />  
95 - <element signature="e#47124#47726#0#PHP" expanded="false" />  
96 - <element signature="e#47732#48159#0#PHP" expanded="false" />  
97 - <element signature="e#48164#48730#0#PHP" expanded="false" /> 79 + <element signature="e#35503#35787#0#PHP" expanded="false" />
  80 + <element signature="e#35792#36428#0#PHP" expanded="false" />
  81 + <element signature="e#36449#36768#0#PHP" expanded="false" />
  82 + <element signature="e#36774#37182#0#PHP" expanded="false" />
  83 + <element signature="e#37188#37947#0#PHP" expanded="false" />
  84 + <element signature="e#37966#38830#0#PHP" expanded="false" />
  85 + <element signature="e#38856#39256#0#PHP" expanded="false" />
  86 + <element signature="e#39279#39852#0#PHP" expanded="false" />
  87 + <element signature="e#39875#40685#0#PHP" expanded="false" />
  88 + <element signature="e#40691#41290#0#PHP" expanded="false" />
  89 + <element signature="e#41295#42259#0#PHP" expanded="false" />
  90 + <element signature="e#42265#42932#0#PHP" expanded="false" />
  91 + <element signature="e#42937#43978#0#PHP" expanded="false" />
  92 + <element signature="e#43984#44647#0#PHP" expanded="false" />
  93 + <element signature="e#44652#45679#0#PHP" expanded="false" />
  94 + <element signature="e#45686#46117#0#PHP" expanded="false" />
  95 + <element signature="e#46122#46700#0#PHP" expanded="false" />
  96 + <element signature="e#46706#47135#0#PHP" expanded="false" />
  97 + <element signature="e#47140#47742#0#PHP" expanded="false" />
  98 + <element signature="e#47748#48175#0#PHP" expanded="false" />
  99 + <element signature="e#48180#48746#0#PHP" expanded="false" />
98 </folding> 100 </folding>
99 </state> 101 </state>
100 </provider> 102 </provider>
@@ -188,7 +190,7 @@ @@ -188,7 +190,7 @@
188 <sorting>DEFINITION_ORDER</sorting> 190 <sorting>DEFINITION_ORDER</sorting>
189 </component> 191 </component>
190 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 192 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
191 - <component name="ProjectFrameBounds"> 193 + <component name="ProjectFrameBounds" extendedState="1">
192 <option name="x" value="231" /> 194 <option name="x" value="231" />
193 <option name="y" value="49" /> 195 <option name="y" value="49" />
194 <option name="width" value="1618" /> 196 <option name="width" value="1618" />
@@ -354,15 +356,15 @@ @@ -354,15 +356,15 @@
354 <workItem from="1576110549014" duration="12973000" /> 356 <workItem from="1576110549014" duration="12973000" />
355 <workItem from="1576213939457" duration="999000" /> 357 <workItem from="1576213939457" duration="999000" />
356 <workItem from="1576215244804" duration="6841000" /> 358 <workItem from="1576215244804" duration="6841000" />
357 - <workItem from="1576298110450" duration="6835000" /> 359 + <workItem from="1576298110450" duration="7028000" />
358 </task> 360 </task>
359 <servers /> 361 <servers />
360 </component> 362 </component>
361 <component name="TimeTrackingManager"> 363 <component name="TimeTrackingManager">
362 - <option name="totallyTimeSpent" value="570923000" /> 364 + <option name="totallyTimeSpent" value="571116000" />
363 </component> 365 </component>
364 <component name="ToolWindowManager"> 366 <component name="ToolWindowManager">
365 - <frame x="231" y="49" width="1618" height="1098" extended-state="0" /> 367 + <frame x="231" y="49" width="1618" height="1098" extended-state="1" />
366 <editor active="true" /> 368 <editor active="true" />
367 <layout> 369 <layout>
368 <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" /> 370 <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 @@ @@ -781,8 +783,8 @@
781 </entry> 783 </entry>
782 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 784 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
783 <provider selected="true" editor-type-id="text-editor"> 785 <provider selected="true" editor-type-id="text-editor">
784 - <state relative-caret-position="-293">  
785 - <caret line="1080" column="79" lean-forward="true" selection-start-line="1080" selection-start-column="79" selection-end-line="1080" selection-end-column="79" /> 786 + <state relative-caret-position="281">
  787 + <caret line="1007" column="7" lean-forward="true" selection-start-line="1007" selection-start-column="7" selection-end-line="1007" selection-end-column="7" />
786 <folding> 788 <folding>
787 <element signature="e#366#791#0#PHP" expanded="false" /> 789 <element signature="e#366#791#0#PHP" expanded="false" />
788 <element signature="e#796#1608#0#PHP" expanded="false" /> 790 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -827,28 +829,29 @@ @@ -827,28 +829,29 @@
827 <element signature="e#30239#30663#0#PHP" expanded="false" /> 829 <element signature="e#30239#30663#0#PHP" expanded="false" />
828 <element signature="e#30668#31279#0#PHP" expanded="false" /> 830 <element signature="e#30668#31279#0#PHP" expanded="false" />
829 <element signature="e#31285#31781#0#PHP" expanded="false" /> 831 <element signature="e#31285#31781#0#PHP" expanded="false" />
  832 + <element signature="e#31786#35497#0#PHP" expanded="false" />
830 <element signature="e#32588#33715#0#PHP" expanded="false" /> 833 <element signature="e#32588#33715#0#PHP" expanded="false" />
831 - <element signature="e#35487#35771#0#PHP" expanded="false" />  
832 - <element signature="e#35776#36412#0#PHP" expanded="false" />  
833 - <element signature="e#36433#36752#0#PHP" expanded="false" />  
834 - <element signature="e#36758#37166#0#PHP" expanded="false" />  
835 - <element signature="e#37172#37931#0#PHP" expanded="false" />  
836 - <element signature="e#37950#38814#0#PHP" expanded="false" />  
837 - <element signature="e#38840#39240#0#PHP" expanded="false" />  
838 - <element signature="e#39263#39836#0#PHP" expanded="false" />  
839 - <element signature="e#39859#40669#0#PHP" expanded="false" />  
840 - <element signature="e#40675#41274#0#PHP" expanded="false" />  
841 - <element signature="e#41279#42243#0#PHP" expanded="false" />  
842 - <element signature="e#42249#42916#0#PHP" expanded="false" />  
843 - <element signature="e#42921#43962#0#PHP" expanded="false" />  
844 - <element signature="e#43968#44631#0#PHP" expanded="false" />  
845 - <element signature="e#44636#45663#0#PHP" expanded="false" />  
846 - <element signature="e#45670#46101#0#PHP" expanded="false" />  
847 - <element signature="e#46106#46684#0#PHP" expanded="false" />  
848 - <element signature="e#46690#47119#0#PHP" expanded="false" />  
849 - <element signature="e#47124#47726#0#PHP" expanded="false" />  
850 - <element signature="e#47732#48159#0#PHP" expanded="false" />  
851 - <element signature="e#48164#48730#0#PHP" expanded="false" /> 834 + <element signature="e#35503#35787#0#PHP" expanded="false" />
  835 + <element signature="e#35792#36428#0#PHP" expanded="false" />
  836 + <element signature="e#36449#36768#0#PHP" expanded="false" />
  837 + <element signature="e#36774#37182#0#PHP" expanded="false" />
  838 + <element signature="e#37188#37947#0#PHP" expanded="false" />
  839 + <element signature="e#37966#38830#0#PHP" expanded="false" />
  840 + <element signature="e#38856#39256#0#PHP" expanded="false" />
  841 + <element signature="e#39279#39852#0#PHP" expanded="false" />
  842 + <element signature="e#39875#40685#0#PHP" expanded="false" />
  843 + <element signature="e#40691#41290#0#PHP" expanded="false" />
  844 + <element signature="e#41295#42259#0#PHP" expanded="false" />
  845 + <element signature="e#42265#42932#0#PHP" expanded="false" />
  846 + <element signature="e#42937#43978#0#PHP" expanded="false" />
  847 + <element signature="e#43984#44647#0#PHP" expanded="false" />
  848 + <element signature="e#44652#45679#0#PHP" expanded="false" />
  849 + <element signature="e#45686#46117#0#PHP" expanded="false" />
  850 + <element signature="e#46122#46700#0#PHP" expanded="false" />
  851 + <element signature="e#46706#47135#0#PHP" expanded="false" />
  852 + <element signature="e#47140#47742#0#PHP" expanded="false" />
  853 + <element signature="e#47748#48175#0#PHP" expanded="false" />
  854 + <element signature="e#48180#48746#0#PHP" expanded="false" />
852 </folding> 855 </folding>
853 </state> 856 </state>
854 </provider> 857 </provider>
@@ -1081,7 +1081,7 @@ class UserController extends RestBaseController @@ -1081,7 +1081,7 @@ class UserController extends RestBaseController
1081 $detail['total'] = $get_integral-($get_integral*($fee['fee']/100)); 1081 $detail['total'] = $get_integral-($get_integral*($fee['fee']/100));
1082 $sub['fee'] = $get_integral*($fee['fee']/100); 1082 $sub['fee'] = $get_integral*($fee['fee']/100);
1083 $res['num'] = $info['num'] + 1; 1083 $res['num'] = $info['num'] + 1;
1084 - $res['add_total'] = $info['add_total'] + $get_integral; 1084 + $res['add_total'] = $info['add_total'] + ($get_integral - $sub['fee']);
1085 $res['now_integral'] = $info['now_integral'] + ($get_integral - $sub['fee']); 1085 $res['now_integral'] = $info['now_integral'] + ($get_integral - $sub['fee']);
1086 } 1086 }
1087 $detail['create_time'] = time(); 1087 $detail['create_time'] = time();