郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 8a1a32d4f61ade395d8a86b818e26947dbb2b414 1 个父辈 f02d576c
1 个管道 的构建 通过 耗费 0 秒

修改积分

内嵌 并排对比
正在显示 2 个修改的文件 包含 89 行增加 和 90 行删除
@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
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" />  
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
7 </list> 6 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -28,8 +27,8 @@ @@ -28,8 +27,8 @@
28 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true"> 27 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
29 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 28 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
30 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="254">  
32 - <caret line="494" column="25" lean-forward="true" selection-start-line="494" selection-start-column="25" selection-end-line="494" selection-end-column="25" /> 30 + <state relative-caret-position="604">
  31 + <caret line="505" column="72" lean-forward="false" selection-start-line="505" selection-start-column="72" selection-end-line="505" selection-end-column="72" />
33 <folding> 32 <folding>
34 <element signature="e#366#791#0#PHP" expanded="false" /> 33 <element signature="e#366#791#0#PHP" expanded="false" />
35 <element signature="e#796#1608#0#PHP" expanded="false" /> 34 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -55,47 +54,47 @@ @@ -55,47 +54,47 @@
55 <element signature="e#11571#11859#0#PHP" expanded="false" /> 54 <element signature="e#11571#11859#0#PHP" expanded="false" />
56 <element signature="e#11864#12803#0#PHP" expanded="false" /> 55 <element signature="e#11864#12803#0#PHP" expanded="false" />
57 <element signature="e#12809#13390#0#PHP" expanded="false" /> 56 <element signature="e#12809#13390#0#PHP" expanded="false" />
58 - <element signature="e#15047#15503#0#PHP" expanded="false" />  
59 - <element signature="e#15508#17576#0#PHP" expanded="false" />  
60 - <element signature="e#17599#17954#0#PHP" expanded="false" />  
61 - <element signature="e#17960#18673#0#PHP" expanded="false" />  
62 - <element signature="e#18678#20135#0#PHP" expanded="false" />  
63 - <element signature="e#20141#20602#0#PHP" expanded="false" />  
64 - <element signature="e#20607#23734#0#PHP" expanded="false" />  
65 - <element signature="e#23740#24349#0#PHP" expanded="false" />  
66 - <element signature="e#24354#25639#0#PHP" expanded="false" />  
67 - <element signature="e#25645#26002#0#PHP" expanded="false" />  
68 - <element signature="e#26007#26990#0#PHP" expanded="false" />  
69 - <element signature="e#26996#27348#0#PHP" expanded="false" />  
70 - <element signature="e#27353#28462#0#PHP" expanded="false" />  
71 - <element signature="e#28468#28823#0#PHP" expanded="false" />  
72 - <element signature="e#28828#30255#0#PHP" expanded="false" />  
73 - <element signature="e#30261#30685#0#PHP" expanded="false" />  
74 - <element signature="e#30690#31301#0#PHP" expanded="false" />  
75 - <element signature="e#31307#31803#0#PHP" expanded="false" />  
76 - <element signature="e#31808#35288#0#PHP" expanded="false" />  
77 - <element signature="e#32610#33737#0#PHP" expanded="false" />  
78 - <element signature="e#35294#35578#0#PHP" expanded="false" />  
79 - <element signature="e#35583#36219#0#PHP" expanded="false" />  
80 - <element signature="e#36240#36559#0#PHP" expanded="false" />  
81 - <element signature="e#36565#36973#0#PHP" expanded="false" />  
82 - <element signature="e#36979#37738#0#PHP" expanded="false" />  
83 - <element signature="e#37757#38621#0#PHP" expanded="false" />  
84 - <element signature="e#38647#39047#0#PHP" expanded="false" />  
85 - <element signature="e#39070#39643#0#PHP" expanded="false" />  
86 - <element signature="e#39666#40476#0#PHP" expanded="false" />  
87 - <element signature="e#40482#41081#0#PHP" expanded="false" />  
88 - <element signature="e#41086#42050#0#PHP" expanded="false" />  
89 - <element signature="e#42056#42723#0#PHP" expanded="false" />  
90 - <element signature="e#42728#43769#0#PHP" expanded="false" />  
91 - <element signature="e#43775#44438#0#PHP" expanded="false" />  
92 - <element signature="e#44443#45470#0#PHP" expanded="false" />  
93 - <element signature="e#45477#45908#0#PHP" expanded="false" />  
94 - <element signature="e#45913#46491#0#PHP" expanded="false" />  
95 - <element signature="e#46497#46926#0#PHP" expanded="false" />  
96 - <element signature="e#46931#47533#0#PHP" expanded="false" />  
97 - <element signature="e#47539#47966#0#PHP" expanded="false" />  
98 - <element signature="e#47971#48537#0#PHP" expanded="false" /> 57 + <element signature="e#15025#15481#0#PHP" expanded="false" />
  58 + <element signature="e#15486#17554#0#PHP" expanded="false" />
  59 + <element signature="e#17577#17932#0#PHP" expanded="false" />
  60 + <element signature="e#17938#18651#0#PHP" expanded="false" />
  61 + <element signature="e#18656#20113#0#PHP" expanded="false" />
  62 + <element signature="e#20119#20580#0#PHP" expanded="false" />
  63 + <element signature="e#20585#23712#0#PHP" expanded="false" />
  64 + <element signature="e#23718#24327#0#PHP" expanded="false" />
  65 + <element signature="e#24332#25617#0#PHP" expanded="false" />
  66 + <element signature="e#25623#25980#0#PHP" expanded="false" />
  67 + <element signature="e#25985#26968#0#PHP" expanded="false" />
  68 + <element signature="e#26974#27326#0#PHP" expanded="false" />
  69 + <element signature="e#27331#28440#0#PHP" expanded="false" />
  70 + <element signature="e#28446#28801#0#PHP" expanded="false" />
  71 + <element signature="e#28806#30233#0#PHP" expanded="false" />
  72 + <element signature="e#30239#30663#0#PHP" expanded="false" />
  73 + <element signature="e#30668#31279#0#PHP" expanded="false" />
  74 + <element signature="e#31285#31781#0#PHP" expanded="false" />
  75 + <element signature="e#31786#35266#0#PHP" expanded="false" />
  76 + <element signature="e#32588#33715#0#PHP" expanded="false" />
  77 + <element signature="e#35272#35556#0#PHP" expanded="false" />
  78 + <element signature="e#35561#36197#0#PHP" expanded="false" />
  79 + <element signature="e#36218#36537#0#PHP" expanded="false" />
  80 + <element signature="e#36543#36951#0#PHP" expanded="false" />
  81 + <element signature="e#36957#37716#0#PHP" expanded="false" />
  82 + <element signature="e#37735#38599#0#PHP" expanded="false" />
  83 + <element signature="e#38625#39025#0#PHP" expanded="false" />
  84 + <element signature="e#39048#39621#0#PHP" expanded="false" />
  85 + <element signature="e#39644#40454#0#PHP" expanded="false" />
  86 + <element signature="e#40460#41059#0#PHP" expanded="false" />
  87 + <element signature="e#41064#42028#0#PHP" expanded="false" />
  88 + <element signature="e#42034#42701#0#PHP" expanded="false" />
  89 + <element signature="e#42706#43747#0#PHP" expanded="false" />
  90 + <element signature="e#43753#44416#0#PHP" expanded="false" />
  91 + <element signature="e#44421#45448#0#PHP" expanded="false" />
  92 + <element signature="e#45455#45886#0#PHP" expanded="false" />
  93 + <element signature="e#45891#46469#0#PHP" expanded="false" />
  94 + <element signature="e#46475#46904#0#PHP" expanded="false" />
  95 + <element signature="e#46909#47511#0#PHP" expanded="false" />
  96 + <element signature="e#47517#47944#0#PHP" expanded="false" />
  97 + <element signature="e#47949#48515#0#PHP" expanded="false" />
99 </folding> 98 </folding>
100 </state> 99 </state>
101 </provider> 100 </provider>
@@ -355,12 +354,12 @@ @@ -355,12 +354,12 @@
355 <workItem from="1576110549014" duration="12973000" /> 354 <workItem from="1576110549014" duration="12973000" />
356 <workItem from="1576213939457" duration="999000" /> 355 <workItem from="1576213939457" duration="999000" />
357 <workItem from="1576215244804" duration="6841000" /> 356 <workItem from="1576215244804" duration="6841000" />
358 - <workItem from="1576298110450" duration="5727000" /> 357 + <workItem from="1576298110450" duration="6172000" />
359 </task> 358 </task>
360 <servers /> 359 <servers />
361 </component> 360 </component>
362 <component name="TimeTrackingManager"> 361 <component name="TimeTrackingManager">
363 - <option name="totallyTimeSpent" value="569815000" /> 362 + <option name="totallyTimeSpent" value="570260000" />
364 </component> 363 </component>
365 <component name="ToolWindowManager"> 364 <component name="ToolWindowManager">
366 <frame x="122" y="112" width="1618" height="1100" extended-state="1" /> 365 <frame x="122" y="112" width="1618" height="1100" extended-state="1" />
@@ -782,8 +781,8 @@ @@ -782,8 +781,8 @@
782 </entry> 781 </entry>
783 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 782 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
784 <provider selected="true" editor-type-id="text-editor"> 783 <provider selected="true" editor-type-id="text-editor">
785 - <state relative-caret-position="254">  
786 - <caret line="494" column="25" lean-forward="true" selection-start-line="494" selection-start-column="25" selection-end-line="494" selection-end-column="25" /> 784 + <state relative-caret-position="604">
  785 + <caret line="505" column="72" lean-forward="false" selection-start-line="505" selection-start-column="72" selection-end-line="505" selection-end-column="72" />
787 <folding> 786 <folding>
788 <element signature="e#366#791#0#PHP" expanded="false" /> 787 <element signature="e#366#791#0#PHP" expanded="false" />
789 <element signature="e#796#1608#0#PHP" expanded="false" /> 788 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -809,47 +808,47 @@ @@ -809,47 +808,47 @@
809 <element signature="e#11571#11859#0#PHP" expanded="false" /> 808 <element signature="e#11571#11859#0#PHP" expanded="false" />
810 <element signature="e#11864#12803#0#PHP" expanded="false" /> 809 <element signature="e#11864#12803#0#PHP" expanded="false" />
811 <element signature="e#12809#13390#0#PHP" expanded="false" /> 810 <element signature="e#12809#13390#0#PHP" expanded="false" />
812 - <element signature="e#15047#15503#0#PHP" expanded="false" />  
813 - <element signature="e#15508#17576#0#PHP" expanded="false" />  
814 - <element signature="e#17599#17954#0#PHP" expanded="false" />  
815 - <element signature="e#17960#18673#0#PHP" expanded="false" />  
816 - <element signature="e#18678#20135#0#PHP" expanded="false" />  
817 - <element signature="e#20141#20602#0#PHP" expanded="false" />  
818 - <element signature="e#20607#23734#0#PHP" expanded="false" />  
819 - <element signature="e#23740#24349#0#PHP" expanded="false" />  
820 - <element signature="e#24354#25639#0#PHP" expanded="false" />  
821 - <element signature="e#25645#26002#0#PHP" expanded="false" />  
822 - <element signature="e#26007#26990#0#PHP" expanded="false" />  
823 - <element signature="e#26996#27348#0#PHP" expanded="false" />  
824 - <element signature="e#27353#28462#0#PHP" expanded="false" />  
825 - <element signature="e#28468#28823#0#PHP" expanded="false" />  
826 - <element signature="e#28828#30255#0#PHP" expanded="false" />  
827 - <element signature="e#30261#30685#0#PHP" expanded="false" />  
828 - <element signature="e#30690#31301#0#PHP" expanded="false" />  
829 - <element signature="e#31307#31803#0#PHP" expanded="false" />  
830 - <element signature="e#31808#35288#0#PHP" expanded="false" />  
831 - <element signature="e#32610#33737#0#PHP" expanded="false" />  
832 - <element signature="e#35294#35578#0#PHP" expanded="false" />  
833 - <element signature="e#35583#36219#0#PHP" expanded="false" />  
834 - <element signature="e#36240#36559#0#PHP" expanded="false" />  
835 - <element signature="e#36565#36973#0#PHP" expanded="false" />  
836 - <element signature="e#36979#37738#0#PHP" expanded="false" />  
837 - <element signature="e#37757#38621#0#PHP" expanded="false" />  
838 - <element signature="e#38647#39047#0#PHP" expanded="false" />  
839 - <element signature="e#39070#39643#0#PHP" expanded="false" />  
840 - <element signature="e#39666#40476#0#PHP" expanded="false" />  
841 - <element signature="e#40482#41081#0#PHP" expanded="false" />  
842 - <element signature="e#41086#42050#0#PHP" expanded="false" />  
843 - <element signature="e#42056#42723#0#PHP" expanded="false" />  
844 - <element signature="e#42728#43769#0#PHP" expanded="false" />  
845 - <element signature="e#43775#44438#0#PHP" expanded="false" />  
846 - <element signature="e#44443#45470#0#PHP" expanded="false" />  
847 - <element signature="e#45477#45908#0#PHP" expanded="false" />  
848 - <element signature="e#45913#46491#0#PHP" expanded="false" />  
849 - <element signature="e#46497#46926#0#PHP" expanded="false" />  
850 - <element signature="e#46931#47533#0#PHP" expanded="false" />  
851 - <element signature="e#47539#47966#0#PHP" expanded="false" />  
852 - <element signature="e#47971#48537#0#PHP" expanded="false" /> 811 + <element signature="e#15025#15481#0#PHP" expanded="false" />
  812 + <element signature="e#15486#17554#0#PHP" expanded="false" />
  813 + <element signature="e#17577#17932#0#PHP" expanded="false" />
  814 + <element signature="e#17938#18651#0#PHP" expanded="false" />
  815 + <element signature="e#18656#20113#0#PHP" expanded="false" />
  816 + <element signature="e#20119#20580#0#PHP" expanded="false" />
  817 + <element signature="e#20585#23712#0#PHP" expanded="false" />
  818 + <element signature="e#23718#24327#0#PHP" expanded="false" />
  819 + <element signature="e#24332#25617#0#PHP" expanded="false" />
  820 + <element signature="e#25623#25980#0#PHP" expanded="false" />
  821 + <element signature="e#25985#26968#0#PHP" expanded="false" />
  822 + <element signature="e#26974#27326#0#PHP" expanded="false" />
  823 + <element signature="e#27331#28440#0#PHP" expanded="false" />
  824 + <element signature="e#28446#28801#0#PHP" expanded="false" />
  825 + <element signature="e#28806#30233#0#PHP" expanded="false" />
  826 + <element signature="e#30239#30663#0#PHP" expanded="false" />
  827 + <element signature="e#30668#31279#0#PHP" expanded="false" />
  828 + <element signature="e#31285#31781#0#PHP" expanded="false" />
  829 + <element signature="e#31786#35266#0#PHP" expanded="false" />
  830 + <element signature="e#32588#33715#0#PHP" expanded="false" />
  831 + <element signature="e#35272#35556#0#PHP" expanded="false" />
  832 + <element signature="e#35561#36197#0#PHP" expanded="false" />
  833 + <element signature="e#36218#36537#0#PHP" expanded="false" />
  834 + <element signature="e#36543#36951#0#PHP" expanded="false" />
  835 + <element signature="e#36957#37716#0#PHP" expanded="false" />
  836 + <element signature="e#37735#38599#0#PHP" expanded="false" />
  837 + <element signature="e#38625#39025#0#PHP" expanded="false" />
  838 + <element signature="e#39048#39621#0#PHP" expanded="false" />
  839 + <element signature="e#39644#40454#0#PHP" expanded="false" />
  840 + <element signature="e#40460#41059#0#PHP" expanded="false" />
  841 + <element signature="e#41064#42028#0#PHP" expanded="false" />
  842 + <element signature="e#42034#42701#0#PHP" expanded="false" />
  843 + <element signature="e#42706#43747#0#PHP" expanded="false" />
  844 + <element signature="e#43753#44416#0#PHP" expanded="false" />
  845 + <element signature="e#44421#45448#0#PHP" expanded="false" />
  846 + <element signature="e#45455#45886#0#PHP" expanded="false" />
  847 + <element signature="e#45891#46469#0#PHP" expanded="false" />
  848 + <element signature="e#46475#46904#0#PHP" expanded="false" />
  849 + <element signature="e#46909#47511#0#PHP" expanded="false" />
  850 + <element signature="e#47517#47944#0#PHP" expanded="false" />
  851 + <element signature="e#47949#48515#0#PHP" expanded="false" />
853 </folding> 852 </folding>
854 </state> 853 </state>
855 </provider> 854 </provider>
@@ -503,7 +503,7 @@ class UserController extends RestBaseController @@ -503,7 +503,7 @@ class UserController extends RestBaseController
503 $data['serve'] = $serve['fee']; 503 $data['serve'] = $serve['fee'];
504 }else{ 504 }else{
505 $data['serve'] = $res['fee']; 505 $data['serve'] = $res['fee'];
506 - $data['get_integral'] = $res['get_integral']-(ceil($res['get_integral']*(5/100))); 506 + $data['get_integral'] = $res['get_integral']-$data['serve'];
507 507
508 } 508 }
509 $this->success('SUCCESS',$data); 509 $this->success('SUCCESS',$data);