郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 c3d4fb7b15f8e9e01809874b0a020ecb21ff5b4e 1 个父辈 6e306235
1 个管道 的构建 通过 耗费 8 秒

修改服务费

内嵌 并排对比
正在显示 3 个修改的文件 包含 126 行增加 和 111 行删除
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/SubscribeController.php" afterPath="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" /> 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
7 </list> 8 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -24,12 +25,12 @@ @@ -24,12 +25,12 @@
24 <select /> 25 <select />
25 </component> 26 </component>
26 <component name="FileEditorManager"> 27 <component name="FileEditorManager">
27 - <leaf> 28 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true"> 29 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
29 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 30 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
30 <provider selected="true" editor-type-id="text-editor"> 31 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="459">  
32 - <caret line="647" column="52" lean-forward="true" selection-start-line="647" selection-start-column="52" selection-end-line="647" selection-end-column="52" /> 32 + <state relative-caret-position="817">
  33 + <caret line="1007" column="7" lean-forward="true" selection-start-line="1007" selection-start-column="7" selection-end-line="1007" selection-end-column="7" />
33 <folding> 34 <folding>
34 <element signature="e#366#791#0#PHP" expanded="false" /> 35 <element signature="e#366#791#0#PHP" expanded="false" />
35 <element signature="e#796#1608#0#PHP" expanded="false" /> 36 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -55,46 +56,48 @@ @@ -55,46 +56,48 @@
55 <element signature="e#11571#11859#0#PHP" expanded="false" /> 56 <element signature="e#11571#11859#0#PHP" expanded="false" />
56 <element signature="e#11864#12803#0#PHP" expanded="false" /> 57 <element signature="e#11864#12803#0#PHP" expanded="false" />
57 <element signature="e#12809#13390#0#PHP" expanded="false" /> 58 <element signature="e#12809#13390#0#PHP" expanded="false" />
58 - <element signature="e#13395#15019#0#PHP" expanded="false" />  
59 - <element signature="e#15025#15481#0#PHP" expanded="false" />  
60 - <element signature="e#15486#17554#0#PHP" expanded="false" />  
61 - <element signature="e#17577#17932#0#PHP" expanded="false" />  
62 - <element signature="e#20143#20604#0#PHP" expanded="false" />  
63 - <element signature="e#20609#23736#0#PHP" expanded="false" />  
64 - <element signature="e#23742#24351#0#PHP" expanded="false" />  
65 - <element signature="e#24356#25641#0#PHP" expanded="false" />  
66 - <element signature="e#25647#26004#0#PHP" expanded="false" />  
67 - <element signature="e#26009#26992#0#PHP" expanded="false" />  
68 - <element signature="e#26998#27350#0#PHP" expanded="false" />  
69 - <element signature="e#27355#28464#0#PHP" expanded="false" />  
70 - <element signature="e#28470#28825#0#PHP" expanded="false" />  
71 - <element signature="e#28830#30257#0#PHP" expanded="false" />  
72 - <element signature="e#30263#30687#0#PHP" expanded="false" />  
73 - <element signature="e#30692#31303#0#PHP" expanded="false" />  
74 - <element signature="e#31309#31805#0#PHP" expanded="false" />  
75 - <element signature="e#31810#35521#0#PHP" expanded="false" />  
76 - <element signature="e#32612#33739#0#PHP" expanded="false" />  
77 - <element signature="e#35527#35811#0#PHP" expanded="false" />  
78 - <element signature="e#35816#36452#0#PHP" expanded="false" />  
79 - <element signature="e#36473#36792#0#PHP" expanded="false" />  
80 - <element signature="e#36798#37206#0#PHP" expanded="false" />  
81 - <element signature="e#37212#37971#0#PHP" expanded="false" />  
82 - <element signature="e#37990#38854#0#PHP" expanded="false" />  
83 - <element signature="e#38880#39280#0#PHP" expanded="false" />  
84 - <element signature="e#39303#39876#0#PHP" expanded="false" />  
85 - <element signature="e#39899#40709#0#PHP" expanded="false" />  
86 - <element signature="e#40715#41314#0#PHP" expanded="false" />  
87 - <element signature="e#41319#42283#0#PHP" expanded="false" />  
88 - <element signature="e#42289#42956#0#PHP" expanded="false" />  
89 - <element signature="e#42961#44002#0#PHP" expanded="false" />  
90 - <element signature="e#44008#44671#0#PHP" expanded="false" />  
91 - <element signature="e#44676#45703#0#PHP" expanded="false" />  
92 - <element signature="e#45710#46141#0#PHP" expanded="false" />  
93 - <element signature="e#46146#46724#0#PHP" expanded="false" />  
94 - <element signature="e#46730#47159#0#PHP" expanded="false" />  
95 - <element signature="e#47164#47766#0#PHP" expanded="false" />  
96 - <element signature="e#47772#48199#0#PHP" expanded="false" />  
97 - <element signature="e#48204#48770#0#PHP" expanded="false" /> 59 + <element signature="e#13395#14945#0#PHP" expanded="false" />
  60 + <element signature="e#14951#15407#0#PHP" expanded="false" />
  61 + <element signature="e#15412#17480#0#PHP" expanded="false" />
  62 + <element signature="e#17503#17858#0#PHP" expanded="false" />
  63 + <element signature="e#17864#18605#0#PHP" expanded="false" />
  64 + <element signature="e#18610#20063#0#PHP" expanded="false" />
  65 + <element signature="e#20069#20530#0#PHP" expanded="false" />
  66 + <element signature="e#20535#23662#0#PHP" expanded="false" />
  67 + <element signature="e#23668#24277#0#PHP" expanded="false" />
  68 + <element signature="e#24282#25567#0#PHP" expanded="false" />
  69 + <element signature="e#25573#25930#0#PHP" expanded="false" />
  70 + <element signature="e#25935#26918#0#PHP" expanded="false" />
  71 + <element signature="e#26924#27276#0#PHP" expanded="false" />
  72 + <element signature="e#27281#28390#0#PHP" expanded="false" />
  73 + <element signature="e#28396#28751#0#PHP" expanded="false" />
  74 + <element signature="e#28756#30183#0#PHP" expanded="false" />
  75 + <element signature="e#30189#30613#0#PHP" expanded="false" />
  76 + <element signature="e#30618#31229#0#PHP" expanded="false" />
  77 + <element signature="e#31235#31731#0#PHP" expanded="false" />
  78 + <element signature="e#31736#35383#0#PHP" expanded="false" />
  79 + <element signature="e#32538#33665#0#PHP" expanded="false" />
  80 + <element signature="e#35389#35673#0#PHP" expanded="false" />
  81 + <element signature="e#35678#36314#0#PHP" expanded="false" />
  82 + <element signature="e#36335#36654#0#PHP" expanded="false" />
  83 + <element signature="e#36660#37068#0#PHP" expanded="false" />
  84 + <element signature="e#37074#37833#0#PHP" expanded="false" />
  85 + <element signature="e#37852#38716#0#PHP" expanded="false" />
  86 + <element signature="e#38742#39142#0#PHP" expanded="false" />
  87 + <element signature="e#39165#39738#0#PHP" expanded="false" />
  88 + <element signature="e#39761#40571#0#PHP" expanded="false" />
  89 + <element signature="e#40577#41176#0#PHP" expanded="false" />
  90 + <element signature="e#41181#42145#0#PHP" expanded="false" />
  91 + <element signature="e#42151#42818#0#PHP" expanded="false" />
  92 + <element signature="e#42823#43864#0#PHP" expanded="false" />
  93 + <element signature="e#43870#44533#0#PHP" expanded="false" />
  94 + <element signature="e#44538#45565#0#PHP" expanded="false" />
  95 + <element signature="e#45572#46003#0#PHP" expanded="false" />
  96 + <element signature="e#46008#46586#0#PHP" expanded="false" />
  97 + <element signature="e#46592#47021#0#PHP" expanded="false" />
  98 + <element signature="e#47026#47628#0#PHP" expanded="false" />
  99 + <element signature="e#47634#48061#0#PHP" expanded="false" />
  100 + <element signature="e#48066#48632#0#PHP" expanded="false" />
98 </folding> 101 </folding>
99 </state> 102 </state>
100 </provider> 103 </provider>
@@ -155,7 +158,6 @@ @@ -155,7 +158,6 @@
155 <option value="$PROJECT_DIR$/app/admin/controller/FeeController.php" /> 158 <option value="$PROJECT_DIR$/app/admin/controller/FeeController.php" />
156 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/bounty/index.html" /> 159 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/bounty/index.html" />
157 <option value="$PROJECT_DIR$/app/admin/controller/BountyController.php" /> 160 <option value="$PROJECT_DIR$/app/admin/controller/BountyController.php" />
158 - <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />  
159 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" /> 161 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
160 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" /> 162 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
161 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 163 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
@@ -170,6 +172,7 @@ @@ -170,6 +172,7 @@
170 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" /> 172 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
171 <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" /> 173 <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
172 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/jifendetail.html" /> 174 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/jifendetail.html" />
  175 + <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
173 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 176 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
174 </list> 177 </list>
175 </option> 178 </option>
@@ -188,9 +191,9 @@ @@ -188,9 +191,9 @@
188 <sorting>DEFINITION_ORDER</sorting> 191 <sorting>DEFINITION_ORDER</sorting>
189 </component> 192 </component>
190 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 193 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
191 - <component name="ProjectFrameBounds" extendedState="1">  
192 - <option name="x" value="274" />  
193 - <option name="y" value="97" /> 194 + <component name="ProjectFrameBounds">
  195 + <option name="x" value="249" />
  196 + <option name="y" value="26" />
194 <option name="width" value="1618" /> 197 <option name="width" value="1618" />
195 <option name="height" value="1096" /> 198 <option name="height" value="1096" />
196 </component> 199 </component>
@@ -356,18 +359,19 @@ @@ -356,18 +359,19 @@
356 <workItem from="1576215244804" duration="6841000" /> 359 <workItem from="1576215244804" duration="6841000" />
357 <workItem from="1576298110450" duration="8414000" /> 360 <workItem from="1576298110450" duration="8414000" />
358 <workItem from="1576455946584" duration="1141000" /> 361 <workItem from="1576455946584" duration="1141000" />
359 - <workItem from="1576459063836" duration="216000" /> 362 + <workItem from="1576459063836" duration="389000" />
  363 + <workItem from="1576463908857" duration="935000" />
360 </task> 364 </task>
361 <servers /> 365 <servers />
362 </component> 366 </component>
363 <component name="TimeTrackingManager"> 367 <component name="TimeTrackingManager">
364 - <option name="totallyTimeSpent" value="573859000" /> 368 + <option name="totallyTimeSpent" value="574967000" />
365 </component> 369 </component>
366 <component name="ToolWindowManager"> 370 <component name="ToolWindowManager">
367 - <frame x="274" y="97" width="1618" height="1096" extended-state="1" /> 371 + <frame x="249" y="26" width="1618" height="1096" extended-state="0" />
368 <editor active="true" /> 372 <editor active="true" />
369 <layout> 373 <layout>
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.19383825" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 374 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19640565" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
371 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 375 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
372 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> 376 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
373 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 377 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -642,13 +646,6 @@ @@ -642,13 +646,6 @@
642 </state> 646 </state>
643 </provider> 647 </provider>
644 </entry> 648 </entry>
645 - <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">  
646 - <provider selected="true" editor-type-id="text-editor">  
647 - <state relative-caret-position="25">  
648 - <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />  
649 - </state>  
650 - </provider>  
651 - </entry>  
652 <entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php"> 649 <entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">
653 <provider selected="true" editor-type-id="text-editor"> 650 <provider selected="true" editor-type-id="text-editor">
654 <state relative-caret-position="127"> 651 <state relative-caret-position="127">
@@ -792,10 +789,28 @@ @@ -792,10 +789,28 @@
792 </state> 789 </state>
793 </provider> 790 </provider>
794 </entry> 791 </entry>
  792 + <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
  793 + <provider selected="true" editor-type-id="text-editor">
  794 + <state relative-caret-position="125">
  795 + <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
  796 + <folding>
  797 + <element signature="e#305#577#0#PHP" expanded="false" />
  798 + <element signature="e#583#854#0#PHP" expanded="false" />
  799 + <element signature="e#859#1113#0#PHP" expanded="false" />
  800 + <element signature="e#1119#1594#0#PHP" expanded="false" />
  801 + <element signature="e#1599#2490#0#PHP" expanded="false" />
  802 + <element signature="e#2497#2911#0#PHP" expanded="false" />
  803 + <element signature="e#2916#3386#0#PHP" expanded="false" />
  804 + <element signature="e#3393#3889#0#PHP" expanded="false" />
  805 + <element signature="e#3894#5028#0#PHP" expanded="false" />
  806 + </folding>
  807 + </state>
  808 + </provider>
  809 + </entry>
795 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 810 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
796 <provider selected="true" editor-type-id="text-editor"> 811 <provider selected="true" editor-type-id="text-editor">
797 - <state relative-caret-position="459">  
798 - <caret line="647" column="52" lean-forward="true" selection-start-line="647" selection-start-column="52" selection-end-line="647" selection-end-column="52" /> 812 + <state relative-caret-position="817">
  813 + <caret line="1007" column="7" lean-forward="true" selection-start-line="1007" selection-start-column="7" selection-end-line="1007" selection-end-column="7" />
799 <folding> 814 <folding>
800 <element signature="e#366#791#0#PHP" expanded="false" /> 815 <element signature="e#366#791#0#PHP" expanded="false" />
801 <element signature="e#796#1608#0#PHP" expanded="false" /> 816 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -821,46 +836,48 @@ @@ -821,46 +836,48 @@
821 <element signature="e#11571#11859#0#PHP" expanded="false" /> 836 <element signature="e#11571#11859#0#PHP" expanded="false" />
822 <element signature="e#11864#12803#0#PHP" expanded="false" /> 837 <element signature="e#11864#12803#0#PHP" expanded="false" />
823 <element signature="e#12809#13390#0#PHP" expanded="false" /> 838 <element signature="e#12809#13390#0#PHP" expanded="false" />
824 - <element signature="e#13395#15019#0#PHP" expanded="false" />  
825 - <element signature="e#15025#15481#0#PHP" expanded="false" />  
826 - <element signature="e#15486#17554#0#PHP" expanded="false" />  
827 - <element signature="e#17577#17932#0#PHP" expanded="false" />  
828 - <element signature="e#20143#20604#0#PHP" expanded="false" />  
829 - <element signature="e#20609#23736#0#PHP" expanded="false" />  
830 - <element signature="e#23742#24351#0#PHP" expanded="false" />  
831 - <element signature="e#24356#25641#0#PHP" expanded="false" />  
832 - <element signature="e#25647#26004#0#PHP" expanded="false" />  
833 - <element signature="e#26009#26992#0#PHP" expanded="false" />  
834 - <element signature="e#26998#27350#0#PHP" expanded="false" />  
835 - <element signature="e#27355#28464#0#PHP" expanded="false" />  
836 - <element signature="e#28470#28825#0#PHP" expanded="false" />  
837 - <element signature="e#28830#30257#0#PHP" expanded="false" />  
838 - <element signature="e#30263#30687#0#PHP" expanded="false" />  
839 - <element signature="e#30692#31303#0#PHP" expanded="false" />  
840 - <element signature="e#31309#31805#0#PHP" expanded="false" />  
841 - <element signature="e#31810#35521#0#PHP" expanded="false" />  
842 - <element signature="e#32612#33739#0#PHP" expanded="false" />  
843 - <element signature="e#35527#35811#0#PHP" expanded="false" />  
844 - <element signature="e#35816#36452#0#PHP" expanded="false" />  
845 - <element signature="e#36473#36792#0#PHP" expanded="false" />  
846 - <element signature="e#36798#37206#0#PHP" expanded="false" />  
847 - <element signature="e#37212#37971#0#PHP" expanded="false" />  
848 - <element signature="e#37990#38854#0#PHP" expanded="false" />  
849 - <element signature="e#38880#39280#0#PHP" expanded="false" />  
850 - <element signature="e#39303#39876#0#PHP" expanded="false" />  
851 - <element signature="e#39899#40709#0#PHP" expanded="false" />  
852 - <element signature="e#40715#41314#0#PHP" expanded="false" />  
853 - <element signature="e#41319#42283#0#PHP" expanded="false" />  
854 - <element signature="e#42289#42956#0#PHP" expanded="false" />  
855 - <element signature="e#42961#44002#0#PHP" expanded="false" />  
856 - <element signature="e#44008#44671#0#PHP" expanded="false" />  
857 - <element signature="e#44676#45703#0#PHP" expanded="false" />  
858 - <element signature="e#45710#46141#0#PHP" expanded="false" />  
859 - <element signature="e#46146#46724#0#PHP" expanded="false" />  
860 - <element signature="e#46730#47159#0#PHP" expanded="false" />  
861 - <element signature="e#47164#47766#0#PHP" expanded="false" />  
862 - <element signature="e#47772#48199#0#PHP" expanded="false" />  
863 - <element signature="e#48204#48770#0#PHP" expanded="false" /> 839 + <element signature="e#13395#14945#0#PHP" expanded="false" />
  840 + <element signature="e#14951#15407#0#PHP" expanded="false" />
  841 + <element signature="e#15412#17480#0#PHP" expanded="false" />
  842 + <element signature="e#17503#17858#0#PHP" expanded="false" />
  843 + <element signature="e#17864#18605#0#PHP" expanded="false" />
  844 + <element signature="e#18610#20063#0#PHP" expanded="false" />
  845 + <element signature="e#20069#20530#0#PHP" expanded="false" />
  846 + <element signature="e#20535#23662#0#PHP" expanded="false" />
  847 + <element signature="e#23668#24277#0#PHP" expanded="false" />
  848 + <element signature="e#24282#25567#0#PHP" expanded="false" />
  849 + <element signature="e#25573#25930#0#PHP" expanded="false" />
  850 + <element signature="e#25935#26918#0#PHP" expanded="false" />
  851 + <element signature="e#26924#27276#0#PHP" expanded="false" />
  852 + <element signature="e#27281#28390#0#PHP" expanded="false" />
  853 + <element signature="e#28396#28751#0#PHP" expanded="false" />
  854 + <element signature="e#28756#30183#0#PHP" expanded="false" />
  855 + <element signature="e#30189#30613#0#PHP" expanded="false" />
  856 + <element signature="e#30618#31229#0#PHP" expanded="false" />
  857 + <element signature="e#31235#31731#0#PHP" expanded="false" />
  858 + <element signature="e#31736#35383#0#PHP" expanded="false" />
  859 + <element signature="e#32538#33665#0#PHP" expanded="false" />
  860 + <element signature="e#35389#35673#0#PHP" expanded="false" />
  861 + <element signature="e#35678#36314#0#PHP" expanded="false" />
  862 + <element signature="e#36335#36654#0#PHP" expanded="false" />
  863 + <element signature="e#36660#37068#0#PHP" expanded="false" />
  864 + <element signature="e#37074#37833#0#PHP" expanded="false" />
  865 + <element signature="e#37852#38716#0#PHP" expanded="false" />
  866 + <element signature="e#38742#39142#0#PHP" expanded="false" />
  867 + <element signature="e#39165#39738#0#PHP" expanded="false" />
  868 + <element signature="e#39761#40571#0#PHP" expanded="false" />
  869 + <element signature="e#40577#41176#0#PHP" expanded="false" />
  870 + <element signature="e#41181#42145#0#PHP" expanded="false" />
  871 + <element signature="e#42151#42818#0#PHP" expanded="false" />
  872 + <element signature="e#42823#43864#0#PHP" expanded="false" />
  873 + <element signature="e#43870#44533#0#PHP" expanded="false" />
  874 + <element signature="e#44538#45565#0#PHP" expanded="false" />
  875 + <element signature="e#45572#46003#0#PHP" expanded="false" />
  876 + <element signature="e#46008#46586#0#PHP" expanded="false" />
  877 + <element signature="e#46592#47021#0#PHP" expanded="false" />
  878 + <element signature="e#47026#47628#0#PHP" expanded="false" />
  879 + <element signature="e#47634#48061#0#PHP" expanded="false" />
  880 + <element signature="e#48066#48632#0#PHP" expanded="false" />
864 </folding> 881 </folding>
865 </state> 882 </state>
866 </provider> 883 </provider>
@@ -175,6 +175,10 @@ class SubscribeController extends RestBaseController @@ -175,6 +175,10 @@ class SubscribeController extends RestBaseController
175 if (!$validate->check($param)) { 175 if (!$validate->check($param)) {
176 $this->error(['code'=>40005,'msg'=>$validate->getError()]); 176 $this->error(['code'=>40005,'msg'=>$validate->getError()]);
177 } 177 }
  178 + $fee = Db::name('recyclefee')
  179 + ->where('id',1)
  180 + ->find();
  181 + $param['fee_money'] = $fee['fee'];
178 $param['num'] = cmf_get_order_sn(); 182 $param['num'] = cmf_get_order_sn();
179 $data = Db::name('subscribe') 183 $data = Db::name('subscribe')
180 ->insert($param); 184 ->insert($param);
@@ -497,10 +497,9 @@ class UserController extends RestBaseController @@ -497,10 +497,9 @@ 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 - $serve = Db::name('recyclefee')->where('id',1)->field('fee')->find();  
501 $data['status'] = $res['status']; 500 $data['status'] = $res['status'];
502 if($data['status'] == 1 || $data['status'] == 0){ 501 if($data['status'] == 1 || $data['status'] == 0){
503 - $data['serve'] = $serve['fee']; 502 + $data['serve'] = $res['fee_money'];
504 }else{ 503 }else{
505 $data['serve'] = $res['fee']; 504 $data['serve'] = $res['fee'];
506 $data['get_integral'] = $res['get_integral']-$data['serve']; 505 $data['get_integral'] = $res['get_integral']-$data['serve'];
@@ -1061,16 +1060,11 @@ class UserController extends RestBaseController @@ -1061,16 +1060,11 @@ class UserController extends RestBaseController
1061 Db::name('detail')->insertGetId($ji); 1060 Db::name('detail')->insertGetId($ji);
1062 } 1061 }
1063 } 1062 }
1064 -  
1065 -  
1066 -  
1067 //添加对应的积分明细 1063 //添加对应的积分明细
1068 $detail['user_id'] = $order['user_id']; 1064 $detail['user_id'] = $order['user_id'];
1069 //判断是否存在服务费 1065 //判断是否存在服务费
1070 - $fee = Db::name('recyclefee')  
1071 - ->where('id',1)  
1072 - ->find();  
1073 - if($fee['fee'] == 0){ 1066 +
  1067 + if(empty($order['fee_money'])){
1074 //没有服务费 1068 //没有服务费
1075 $detail['total'] = $get_integral; 1069 $detail['total'] = $get_integral;
1076 $sub['fee'] = 0; 1070 $sub['fee'] = 0;
@@ -1079,8 +1073,8 @@ class UserController extends RestBaseController @@ -1079,8 +1073,8 @@ class UserController extends RestBaseController
1079 $res['now_integral'] = $info['now_integral'] + $get_integral; 1073 $res['now_integral'] = $info['now_integral'] + $get_integral;
1080 }else{ 1074 }else{
1081 //有服务费 1075 //有服务费
1082 - $detail['total'] = $get_integral-($get_integral*($fee['fee']/100));  
1083 - $sub['fee'] = $get_integral*($fee['fee']/100); 1076 + $detail['total'] = $get_integral-($get_integral*($order['fee_money']/100));
  1077 + $sub['fee'] = $get_integral*($order['fee_money']/100);
1084 $res['num'] = $info['num'] + 1; 1078 $res['num'] = $info['num'] + 1;
1085 $res['add_total'] = $info['add_total'] + ($get_integral - $sub['fee']); 1079 $res['add_total'] = $info['add_total'] + ($get_integral - $sub['fee']);
1086 $res['now_integral'] = $info['now_integral'] + ($get_integral - $sub['fee']); 1080 $res['now_integral'] = $info['now_integral'] + ($get_integral - $sub['fee']);