郭盛 / scrap · 提交

转到一个项目

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

修改服务费

内嵌 并排对比
正在显示 2 个修改的文件 包含 96 行增加 和 93 行删除
@@ -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="180">  
31 - <caret line="812" column="29" lean-forward="false" selection-start-line="812" selection-start-column="29" selection-end-line="812" selection-end-column="29" /> 31 + <state relative-caret-position="230">
  32 + <caret line="528" column="7" lean-forward="true" selection-start-line="528" selection-start-column="7" selection-end-line="528" 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" />
@@ -54,47 +55,48 @@ @@ -54,47 +55,48 @@
54 <element signature="e#11571#11859#0#PHP" expanded="false" /> 55 <element signature="e#11571#11859#0#PHP" expanded="false" />
55 <element signature="e#11864#12803#0#PHP" expanded="false" /> 56 <element signature="e#11864#12803#0#PHP" expanded="false" />
56 <element signature="e#12809#13390#0#PHP" expanded="false" /> 57 <element signature="e#12809#13390#0#PHP" expanded="false" />
57 - <element signature="e#13395#15023#0#PHP" expanded="false" />  
58 - <element signature="e#15029#15485#0#PHP" expanded="false" />  
59 - <element signature="e#15490#17558#0#PHP" expanded="false" />  
60 - <element signature="e#17581#17936#0#PHP" expanded="false" />  
61 - <element signature="e#17942#18655#0#PHP" expanded="false" />  
62 - <element signature="e#18660#20117#0#PHP" expanded="false" />  
63 - <element signature="e#20123#20584#0#PHP" expanded="false" />  
64 - <element signature="e#20589#23716#0#PHP" expanded="false" />  
65 - <element signature="e#23722#24331#0#PHP" expanded="false" />  
66 - <element signature="e#24336#25621#0#PHP" expanded="false" />  
67 - <element signature="e#25627#25984#0#PHP" expanded="false" />  
68 - <element signature="e#25989#26972#0#PHP" expanded="false" />  
69 - <element signature="e#26978#27330#0#PHP" expanded="false" />  
70 - <element signature="e#28450#28805#0#PHP" expanded="false" />  
71 - <element signature="e#28810#30237#0#PHP" expanded="false" />  
72 - <element signature="e#30243#30667#0#PHP" expanded="false" />  
73 - <element signature="e#30672#31283#0#PHP" expanded="false" />  
74 - <element signature="e#31289#31785#0#PHP" expanded="false" />  
75 - <element signature="e#31790#35152#0#PHP" expanded="false" />  
76 - <element signature="e#32592#33719#0#PHP" expanded="false" />  
77 - <element signature="e#35158#35442#0#PHP" expanded="false" />  
78 - <element signature="e#35447#36083#0#PHP" expanded="false" />  
79 - <element signature="e#36104#36423#0#PHP" expanded="false" />  
80 - <element signature="e#36429#36837#0#PHP" expanded="false" />  
81 - <element signature="e#36843#37602#0#PHP" expanded="false" />  
82 - <element signature="e#37621#38485#0#PHP" expanded="false" />  
83 - <element signature="e#38511#38911#0#PHP" expanded="false" />  
84 - <element signature="e#38934#39507#0#PHP" expanded="false" />  
85 - <element signature="e#39530#40340#0#PHP" expanded="false" />  
86 - <element signature="e#40346#40945#0#PHP" expanded="false" />  
87 - <element signature="e#40950#41914#0#PHP" expanded="false" />  
88 - <element signature="e#41920#42587#0#PHP" expanded="false" />  
89 - <element signature="e#42592#43633#0#PHP" expanded="false" />  
90 - <element signature="e#43639#44302#0#PHP" expanded="false" />  
91 - <element signature="e#44307#45334#0#PHP" expanded="false" />  
92 - <element signature="e#45341#45772#0#PHP" expanded="false" />  
93 - <element signature="e#45777#46355#0#PHP" expanded="false" />  
94 - <element signature="e#46361#46790#0#PHP" expanded="false" />  
95 - <element signature="e#46795#47397#0#PHP" expanded="false" />  
96 - <element signature="e#47403#47830#0#PHP" expanded="false" />  
97 - <element signature="e#47835#48401#0#PHP" expanded="false" /> 58 + <element signature="e#13395#15063#0#PHP" expanded="false" />
  59 + <element signature="e#15069#15525#0#PHP" expanded="false" />
  60 + <element signature="e#15530#17598#0#PHP" expanded="false" />
  61 + <element signature="e#17621#17976#0#PHP" expanded="false" />
  62 + <element signature="e#17982#18695#0#PHP" expanded="false" />
  63 + <element signature="e#18700#20157#0#PHP" expanded="false" />
  64 + <element signature="e#20163#20624#0#PHP" expanded="false" />
  65 + <element signature="e#20629#23756#0#PHP" expanded="false" />
  66 + <element signature="e#23762#24371#0#PHP" expanded="false" />
  67 + <element signature="e#24376#25661#0#PHP" expanded="false" />
  68 + <element signature="e#25667#26024#0#PHP" expanded="false" />
  69 + <element signature="e#26029#27012#0#PHP" expanded="false" />
  70 + <element signature="e#27018#27370#0#PHP" expanded="false" />
  71 + <element signature="e#27375#28484#0#PHP" expanded="false" />
  72 + <element signature="e#28490#28845#0#PHP" expanded="false" />
  73 + <element signature="e#28850#30277#0#PHP" expanded="false" />
  74 + <element signature="e#30283#30707#0#PHP" expanded="false" />
  75 + <element signature="e#30712#31323#0#PHP" expanded="false" />
  76 + <element signature="e#31329#31825#0#PHP" expanded="false" />
  77 + <element signature="e#31830#35192#0#PHP" expanded="false" />
  78 + <element signature="e#32632#33759#0#PHP" expanded="false" />
  79 + <element signature="e#35198#35482#0#PHP" expanded="false" />
  80 + <element signature="e#35487#36123#0#PHP" expanded="false" />
  81 + <element signature="e#36144#36463#0#PHP" expanded="false" />
  82 + <element signature="e#36469#36877#0#PHP" expanded="false" />
  83 + <element signature="e#36883#37642#0#PHP" expanded="false" />
  84 + <element signature="e#37661#38525#0#PHP" expanded="false" />
  85 + <element signature="e#38551#38951#0#PHP" expanded="false" />
  86 + <element signature="e#38974#39547#0#PHP" expanded="false" />
  87 + <element signature="e#39570#40380#0#PHP" expanded="false" />
  88 + <element signature="e#40386#40985#0#PHP" expanded="false" />
  89 + <element signature="e#40990#41954#0#PHP" expanded="false" />
  90 + <element signature="e#41960#42627#0#PHP" expanded="false" />
  91 + <element signature="e#42632#43673#0#PHP" expanded="false" />
  92 + <element signature="e#43679#44342#0#PHP" expanded="false" />
  93 + <element signature="e#44347#45374#0#PHP" expanded="false" />
  94 + <element signature="e#45381#45812#0#PHP" expanded="false" />
  95 + <element signature="e#45817#46395#0#PHP" expanded="false" />
  96 + <element signature="e#46401#46830#0#PHP" expanded="false" />
  97 + <element signature="e#46835#47437#0#PHP" expanded="false" />
  98 + <element signature="e#47443#47870#0#PHP" expanded="false" />
  99 + <element signature="e#47875#48441#0#PHP" expanded="false" />
98 </folding> 100 </folding>
99 </state> 101 </state>
100 </provider> 102 </provider>
@@ -189,8 +191,8 @@ @@ -189,8 +191,8 @@
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">
192 - <option name="x" value="371" />  
193 - <option name="y" value="37" /> 194 + <option name="x" value="404" />
  195 + <option name="y" value="72" />
194 <option name="width" value="1618" /> 196 <option name="width" value="1618" />
195 <option name="height" value="1007" /> 197 <option name="height" value="1007" />
196 </component> 198 </component>
@@ -351,15 +353,15 @@ @@ -351,15 +353,15 @@
351 <workItem from="1576049946357" duration="1233000" /> 353 <workItem from="1576049946357" duration="1233000" />
352 <workItem from="1576056936489" duration="7947000" /> 354 <workItem from="1576056936489" duration="7947000" />
353 <workItem from="1576066696521" duration="5462000" /> 355 <workItem from="1576066696521" duration="5462000" />
354 - <workItem from="1576110549014" duration="3202000" /> 356 + <workItem from="1576110549014" duration="3737000" />
355 </task> 357 </task>
356 <servers /> 358 <servers />
357 </component> 359 </component>
358 <component name="TimeTrackingManager"> 360 <component name="TimeTrackingManager">
359 - <option name="totallyTimeSpent" value="546477000" /> 361 + <option name="totallyTimeSpent" value="547012000" />
360 </component> 362 </component>
361 <component name="ToolWindowManager"> 363 <component name="ToolWindowManager">
362 - <frame x="371" y="37" width="1618" height="1007" extended-state="0" /> 364 + <frame x="404" y="72" width="1618" height="1007" extended-state="0" />
363 <editor active="true" /> 365 <editor active="true" />
364 <layout> 366 <layout>
365 <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" /> 367 <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 @@ @@ -834,8 +836,8 @@
834 </entry> 836 </entry>
835 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 837 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
836 <provider selected="true" editor-type-id="text-editor"> 838 <provider selected="true" editor-type-id="text-editor">
837 - <state relative-caret-position="180">  
838 - <caret line="812" column="29" lean-forward="false" selection-start-line="812" selection-start-column="29" selection-end-line="812" selection-end-column="29" /> 839 + <state relative-caret-position="230">
  840 + <caret line="528" column="7" lean-forward="true" selection-start-line="528" selection-start-column="7" selection-end-line="528" selection-end-column="7" />
839 <folding> 841 <folding>
840 <element signature="e#366#791#0#PHP" expanded="false" /> 842 <element signature="e#366#791#0#PHP" expanded="false" />
841 <element signature="e#796#1608#0#PHP" expanded="false" /> 843 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -861,47 +863,48 @@ @@ -861,47 +863,48 @@
861 <element signature="e#11571#11859#0#PHP" expanded="false" /> 863 <element signature="e#11571#11859#0#PHP" expanded="false" />
862 <element signature="e#11864#12803#0#PHP" expanded="false" /> 864 <element signature="e#11864#12803#0#PHP" expanded="false" />
863 <element signature="e#12809#13390#0#PHP" expanded="false" /> 865 <element signature="e#12809#13390#0#PHP" expanded="false" />
864 - <element signature="e#13395#15023#0#PHP" expanded="false" />  
865 - <element signature="e#15029#15485#0#PHP" expanded="false" />  
866 - <element signature="e#15490#17558#0#PHP" expanded="false" />  
867 - <element signature="e#17581#17936#0#PHP" expanded="false" />  
868 - <element signature="e#17942#18655#0#PHP" expanded="false" />  
869 - <element signature="e#18660#20117#0#PHP" expanded="false" />  
870 - <element signature="e#20123#20584#0#PHP" expanded="false" />  
871 - <element signature="e#20589#23716#0#PHP" expanded="false" />  
872 - <element signature="e#23722#24331#0#PHP" expanded="false" />  
873 - <element signature="e#24336#25621#0#PHP" expanded="false" />  
874 - <element signature="e#25627#25984#0#PHP" expanded="false" />  
875 - <element signature="e#25989#26972#0#PHP" expanded="false" />  
876 - <element signature="e#26978#27330#0#PHP" expanded="false" />  
877 - <element signature="e#28450#28805#0#PHP" expanded="false" />  
878 - <element signature="e#28810#30237#0#PHP" expanded="false" />  
879 - <element signature="e#30243#30667#0#PHP" expanded="false" />  
880 - <element signature="e#30672#31283#0#PHP" expanded="false" />  
881 - <element signature="e#31289#31785#0#PHP" expanded="false" />  
882 - <element signature="e#31790#35152#0#PHP" expanded="false" />  
883 - <element signature="e#32592#33719#0#PHP" expanded="false" />  
884 - <element signature="e#35158#35442#0#PHP" expanded="false" />  
885 - <element signature="e#35447#36083#0#PHP" expanded="false" />  
886 - <element signature="e#36104#36423#0#PHP" expanded="false" />  
887 - <element signature="e#36429#36837#0#PHP" expanded="false" />  
888 - <element signature="e#36843#37602#0#PHP" expanded="false" />  
889 - <element signature="e#37621#38485#0#PHP" expanded="false" />  
890 - <element signature="e#38511#38911#0#PHP" expanded="false" />  
891 - <element signature="e#38934#39507#0#PHP" expanded="false" />  
892 - <element signature="e#39530#40340#0#PHP" expanded="false" />  
893 - <element signature="e#40346#40945#0#PHP" expanded="false" />  
894 - <element signature="e#40950#41914#0#PHP" expanded="false" />  
895 - <element signature="e#41920#42587#0#PHP" expanded="false" />  
896 - <element signature="e#42592#43633#0#PHP" expanded="false" />  
897 - <element signature="e#43639#44302#0#PHP" expanded="false" />  
898 - <element signature="e#44307#45334#0#PHP" expanded="false" />  
899 - <element signature="e#45341#45772#0#PHP" expanded="false" />  
900 - <element signature="e#45777#46355#0#PHP" expanded="false" />  
901 - <element signature="e#46361#46790#0#PHP" expanded="false" />  
902 - <element signature="e#46795#47397#0#PHP" expanded="false" />  
903 - <element signature="e#47403#47830#0#PHP" expanded="false" />  
904 - <element signature="e#47835#48401#0#PHP" expanded="false" /> 866 + <element signature="e#13395#15063#0#PHP" expanded="false" />
  867 + <element signature="e#15069#15525#0#PHP" expanded="false" />
  868 + <element signature="e#15530#17598#0#PHP" expanded="false" />
  869 + <element signature="e#17621#17976#0#PHP" expanded="false" />
  870 + <element signature="e#17982#18695#0#PHP" expanded="false" />
  871 + <element signature="e#18700#20157#0#PHP" expanded="false" />
  872 + <element signature="e#20163#20624#0#PHP" expanded="false" />
  873 + <element signature="e#20629#23756#0#PHP" expanded="false" />
  874 + <element signature="e#23762#24371#0#PHP" expanded="false" />
  875 + <element signature="e#24376#25661#0#PHP" expanded="false" />
  876 + <element signature="e#25667#26024#0#PHP" expanded="false" />
  877 + <element signature="e#26029#27012#0#PHP" expanded="false" />
  878 + <element signature="e#27018#27370#0#PHP" expanded="false" />
  879 + <element signature="e#27375#28484#0#PHP" expanded="false" />
  880 + <element signature="e#28490#28845#0#PHP" expanded="false" />
  881 + <element signature="e#28850#30277#0#PHP" expanded="false" />
  882 + <element signature="e#30283#30707#0#PHP" expanded="false" />
  883 + <element signature="e#30712#31323#0#PHP" expanded="false" />
  884 + <element signature="e#31329#31825#0#PHP" expanded="false" />
  885 + <element signature="e#31830#35192#0#PHP" expanded="false" />
  886 + <element signature="e#32632#33759#0#PHP" expanded="false" />
  887 + <element signature="e#35198#35482#0#PHP" expanded="false" />
  888 + <element signature="e#35487#36123#0#PHP" expanded="false" />
  889 + <element signature="e#36144#36463#0#PHP" expanded="false" />
  890 + <element signature="e#36469#36877#0#PHP" expanded="false" />
  891 + <element signature="e#36883#37642#0#PHP" expanded="false" />
  892 + <element signature="e#37661#38525#0#PHP" expanded="false" />
  893 + <element signature="e#38551#38951#0#PHP" expanded="false" />
  894 + <element signature="e#38974#39547#0#PHP" expanded="false" />
  895 + <element signature="e#39570#40380#0#PHP" expanded="false" />
  896 + <element signature="e#40386#40985#0#PHP" expanded="false" />
  897 + <element signature="e#40990#41954#0#PHP" expanded="false" />
  898 + <element signature="e#41960#42627#0#PHP" expanded="false" />
  899 + <element signature="e#42632#43673#0#PHP" expanded="false" />
  900 + <element signature="e#43679#44342#0#PHP" expanded="false" />
  901 + <element signature="e#44347#45374#0#PHP" expanded="false" />
  902 + <element signature="e#45381#45812#0#PHP" expanded="false" />
  903 + <element signature="e#45817#46395#0#PHP" expanded="false" />
  904 + <element signature="e#46401#46830#0#PHP" expanded="false" />
  905 + <element signature="e#46835#47437#0#PHP" expanded="false" />
  906 + <element signature="e#47443#47870#0#PHP" expanded="false" />
  907 + <element signature="e#47875#48441#0#PHP" expanded="false" />
905 </folding> 908 </folding>
906 </state> 909 </state>
907 </provider> 910 </provider>
@@ -497,13 +497,13 @@ class UserController extends RestBaseController @@ -497,13 +497,13 @@ class UserController extends RestBaseController
497 $data['sub_time'] = $res['sub_time']; 497 $data['sub_time'] = $res['sub_time'];
498 $data['image'] = explode(',',$res['image']); 498 $data['image'] = explode(',',$res['image']);
499 $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($res['content'])); 499 $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($res['content']));
500 - $data['get_integral'] = $res['get_integral'];  
501 $serve = Db::name('recyclefee')->where('id',1)->field('fee')->find(); 500 $serve = Db::name('recyclefee')->where('id',1)->field('fee')->find();
502 $data['status'] = $res['status']; 501 $data['status'] = $res['status'];
503 if($data['status'] == 1 || $data['status'] == 0){ 502 if($data['status'] == 1 || $data['status'] == 0){
504 $data['serve'] = $serve['fee']; 503 $data['serve'] = $serve['fee'];
505 }else{ 504 }else{
506 - $data['serve'] = ceil($data['get_integral']*(5/100)); 505 + $data['get_integral'] = $res['get_integral']-(ceil($res['get_integral']*(5/100)));
  506 + $data['serve'] = ceil($res['get_integral']*(5/100));
507 } 507 }
508 $this->success('SUCCESS',$data); 508 $this->success('SUCCESS',$data);
509 } 509 }