修改服务费

郭盛
.idea/workspace.xml
api/index/controller/UserController.php
--- a/.idea/workspace.xml
查看文件 @f02d576
+++ b/.idea/workspace.xml
查看文件 @f02d576
@@ -2,11 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/detail.html" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/jifendetail.html" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" afterPath="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
+      <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" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -28,23 +25,77 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="PayController.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
+      <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="399">
-              <caret line="66" column="28" lean-forward="false" selection-start-line="66" selection-start-column="28" selection-end-line="66" selection-end-column="28" />
+            <state relative-caret-position="254">
+              <caret line="494" column="25" lean-forward="true" selection-start-line="494" selection-start-column="25" selection-end-line="494" selection-end-column="25" />
               <folding>
-                <element signature="e#324#941#0#PHP" expanded="false" />
-                <element signature="e#947#1011#0#PHP" expanded="false" />
-                <element signature="e#1016#1849#0#PHP" expanded="false" />
-                <element signature="e#1855#1936#0#PHP" expanded="false" />
-                <element signature="e#1941#3993#0#PHP" expanded="false" />
-                <element signature="e#4000#4023#0#PHP" expanded="false" />
-                <element signature="e#4028#4287#0#PHP" expanded="false" />
-                <element signature="e#4294#4343#0#PHP" expanded="false" />
-                <element signature="e#4348#4776#0#PHP" expanded="false" />
-                <element signature="e#4783#4847#0#PHP" expanded="false" />
-                <element signature="e#4852#5588#0#PHP" expanded="false" />
+                <element signature="e#366#791#0#PHP" expanded="false" />
+                <element signature="e#796#1608#0#PHP" expanded="false" />
+                <element signature="e#1614#1872#0#PHP" expanded="false" />
+                <element signature="e#1877#2260#0#PHP" expanded="false" />
+                <element signature="e#2266#2495#0#PHP" expanded="false" />
+                <element signature="e#2500#4135#0#PHP" expanded="false" />
+                <element signature="e#4141#4381#0#PHP" expanded="false" />
+                <element signature="e#4386#4621#0#PHP" expanded="false" />
+                <element signature="e#4627#4974#0#PHP" expanded="false" />
+                <element signature="e#4979#5425#0#PHP" expanded="false" />
+                <element signature="e#5431#5691#0#PHP" expanded="false" />
+                <element signature="e#5696#5897#0#PHP" expanded="false" />
+                <element signature="e#5903#6165#0#PHP" expanded="false" />
+                <element signature="e#6170#6375#0#PHP" expanded="false" />
+                <element signature="e#6381#6860#0#PHP" expanded="false" />
+                <element signature="e#6865#9088#0#PHP" expanded="false" />
+                <element signature="e#9111#9642#0#PHP" expanded="false" />
+                <element signature="e#9648#9928#0#PHP" expanded="false" />
+                <element signature="e#9933#10325#0#PHP" expanded="false" />
+                <element signature="e#10331#10615#0#PHP" expanded="false" />
+                <element signature="e#10620#11565#0#PHP" expanded="false" />
+                <element signature="e#11571#11859#0#PHP" expanded="false" />
+                <element signature="e#11864#12803#0#PHP" expanded="false" />
+                <element signature="e#12809#13390#0#PHP" expanded="false" />
+                <element signature="e#15047#15503#0#PHP" expanded="false" />
+                <element signature="e#15508#17576#0#PHP" expanded="false" />
+                <element signature="e#17599#17954#0#PHP" expanded="false" />
+                <element signature="e#17960#18673#0#PHP" expanded="false" />
+                <element signature="e#18678#20135#0#PHP" expanded="false" />
+                <element signature="e#20141#20602#0#PHP" expanded="false" />
+                <element signature="e#20607#23734#0#PHP" expanded="false" />
+                <element signature="e#23740#24349#0#PHP" expanded="false" />
+                <element signature="e#24354#25639#0#PHP" expanded="false" />
+                <element signature="e#25645#26002#0#PHP" expanded="false" />
+                <element signature="e#26007#26990#0#PHP" expanded="false" />
+                <element signature="e#26996#27348#0#PHP" expanded="false" />
+                <element signature="e#27353#28462#0#PHP" expanded="false" />
+                <element signature="e#28468#28823#0#PHP" expanded="false" />
+                <element signature="e#28828#30255#0#PHP" expanded="false" />
+                <element signature="e#30261#30685#0#PHP" expanded="false" />
+                <element signature="e#30690#31301#0#PHP" expanded="false" />
+                <element signature="e#31307#31803#0#PHP" expanded="false" />
+                <element signature="e#31808#35288#0#PHP" expanded="false" />
+                <element signature="e#32610#33737#0#PHP" expanded="false" />
+                <element signature="e#35294#35578#0#PHP" expanded="false" />
+                <element signature="e#35583#36219#0#PHP" expanded="false" />
+                <element signature="e#36240#36559#0#PHP" expanded="false" />
+                <element signature="e#36565#36973#0#PHP" expanded="false" />
+                <element signature="e#36979#37738#0#PHP" expanded="false" />
+                <element signature="e#37757#38621#0#PHP" expanded="false" />
+                <element signature="e#38647#39047#0#PHP" expanded="false" />
+                <element signature="e#39070#39643#0#PHP" expanded="false" />
+                <element signature="e#39666#40476#0#PHP" expanded="false" />
+                <element signature="e#40482#41081#0#PHP" expanded="false" />
+                <element signature="e#41086#42050#0#PHP" expanded="false" />
+                <element signature="e#42056#42723#0#PHP" expanded="false" />
+                <element signature="e#42728#43769#0#PHP" expanded="false" />
+                <element signature="e#43775#44438#0#PHP" expanded="false" />
+                <element signature="e#44443#45470#0#PHP" expanded="false" />
+                <element signature="e#45477#45908#0#PHP" expanded="false" />
+                <element signature="e#45913#46491#0#PHP" expanded="false" />
+                <element signature="e#46497#46926#0#PHP" expanded="false" />
+                <element signature="e#46931#47533#0#PHP" expanded="false" />
+                <element signature="e#47539#47966#0#PHP" expanded="false" />
+                <element signature="e#47971#48537#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -116,11 +167,11 @@
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
         <option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
-        <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/detail.html" />
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
         <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
         <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/jifendetail.html" />
+        <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
       </list>
     </option>
   </component>
@@ -138,11 +189,11 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
-  <component name="ProjectFrameBounds">
-    <option name="x" value="192" />
-    <option name="y" value="60" />
+  <component name="ProjectFrameBounds" extendedState="1">
+    <option name="x" value="122" />
+    <option name="y" value="112" />
     <option name="width" value="1618" />
-    <option name="height" value="1061" />
+    <option name="height" value="1100" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -188,13 +239,13 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scratches" />
       <pane id="Scope" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../areial" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../micro" />
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
   </component>
   <component name="RecentsManager">
@@ -304,25 +355,27 @@
       <workItem from="1576110549014" duration="12973000" />
       <workItem from="1576213939457" duration="999000" />
       <workItem from="1576215244804" duration="6841000" />
+      <workItem from="1576298110450" duration="5727000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="564088000" />
+    <option name="totallyTimeSpent" value="569815000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="192" y="60" width="1618" height="1061" extended-state="0" />
+    <frame x="122" y="112" width="1618" height="1100" 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.18613607" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <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" />
       <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" />
       <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" />
       <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" />
-      <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" 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="false" content_ui="tabs" />
+      <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25086308" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -359,7 +412,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="13" />
+      <option name="time" value="15" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -630,13 +683,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="421" column="38" lean-forward="false" selection-start-line="421" selection-start-column="38" selection-end-line="421" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/admin/controller/ThemeController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -648,7 +694,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="400">
           <caret line="18" column="19" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="34" selection-end-column="7" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -656,7 +701,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -664,7 +708,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-225">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -672,7 +715,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="585">
           <caret line="70" column="8" lean-forward="false" selection-start-line="70" selection-start-column="8" selection-end-line="70" selection-end-column="45" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -680,7 +722,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1074">
           <caret line="45" column="45" lean-forward="false" selection-start-line="45" selection-start-column="45" selection-end-line="45" selection-end-column="45" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -688,7 +729,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="475">
           <caret line="29" column="8" lean-forward="true" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="29" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -696,17 +736,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="524">
           <caret line="177" column="17" lean-forward="true" selection-start-line="177" selection-start-column="17" selection-end-line="177" selection-end-column="17" />
-          <folding>
-            <element signature="e#676#1173#0#PHP" expanded="false" />
-            <element signature="e#1236#1529#0#PHP" expanded="false" />
-            <element signature="e#2304#2598#0#PHP" expanded="false" />
-            <element signature="e#2603#3052#0#PHP" expanded="false" />
-            <element signature="e#3058#3352#0#PHP" expanded="false" />
-            <element signature="e#3357#3666#0#PHP" expanded="false" />
-            <element signature="e#3685#3981#0#PHP" expanded="false" />
-            <element signature="e#3998#4297#0#PHP" expanded="false" />
-            <element signature="e#4314#4673#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -714,11 +743,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#242#346#0#PHP" expanded="false" />
-            <element signature="e#351#717#0#PHP" expanded="false" />
-            <element signature="e#739#805#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -726,10 +750,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#396#1051#0#PHP" expanded="false" />
-            <element signature="e#1069#1741#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -737,17 +757,13 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
           <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding>
-            <element signature="e#296#630#0#PHP" expanded="false" />
-            <element signature="e#636#1184#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="66" column="28" lean-forward="false" selection-start-line="66" selection-start-column="28" selection-end-line="66" selection-end-column="28" />
+        <state relative-caret-position="500">
+          <caret line="65" column="7" lean-forward="true" selection-start-line="65" selection-start-column="7" selection-end-line="65" selection-end-column="7" />
           <folding>
             <element signature="e#324#941#0#PHP" expanded="false" />
             <element signature="e#947#1011#0#PHP" expanded="false" />
@@ -764,5 +780,79 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="494" column="25" lean-forward="true" selection-start-line="494" selection-start-column="25" selection-end-line="494" selection-end-column="25" />
+          <folding>
+            <element signature="e#366#791#0#PHP" expanded="false" />
+            <element signature="e#796#1608#0#PHP" expanded="false" />
+            <element signature="e#1614#1872#0#PHP" expanded="false" />
+            <element signature="e#1877#2260#0#PHP" expanded="false" />
+            <element signature="e#2266#2495#0#PHP" expanded="false" />
+            <element signature="e#2500#4135#0#PHP" expanded="false" />
+            <element signature="e#4141#4381#0#PHP" expanded="false" />
+            <element signature="e#4386#4621#0#PHP" expanded="false" />
+            <element signature="e#4627#4974#0#PHP" expanded="false" />
+            <element signature="e#4979#5425#0#PHP" expanded="false" />
+            <element signature="e#5431#5691#0#PHP" expanded="false" />
+            <element signature="e#5696#5897#0#PHP" expanded="false" />
+            <element signature="e#5903#6165#0#PHP" expanded="false" />
+            <element signature="e#6170#6375#0#PHP" expanded="false" />
+            <element signature="e#6381#6860#0#PHP" expanded="false" />
+            <element signature="e#6865#9088#0#PHP" expanded="false" />
+            <element signature="e#9111#9642#0#PHP" expanded="false" />
+            <element signature="e#9648#9928#0#PHP" expanded="false" />
+            <element signature="e#9933#10325#0#PHP" expanded="false" />
+            <element signature="e#10331#10615#0#PHP" expanded="false" />
+            <element signature="e#10620#11565#0#PHP" expanded="false" />
+            <element signature="e#11571#11859#0#PHP" expanded="false" />
+            <element signature="e#11864#12803#0#PHP" expanded="false" />
+            <element signature="e#12809#13390#0#PHP" expanded="false" />
+            <element signature="e#15047#15503#0#PHP" expanded="false" />
+            <element signature="e#15508#17576#0#PHP" expanded="false" />
+            <element signature="e#17599#17954#0#PHP" expanded="false" />
+            <element signature="e#17960#18673#0#PHP" expanded="false" />
+            <element signature="e#18678#20135#0#PHP" expanded="false" />
+            <element signature="e#20141#20602#0#PHP" expanded="false" />
+            <element signature="e#20607#23734#0#PHP" expanded="false" />
+            <element signature="e#23740#24349#0#PHP" expanded="false" />
+            <element signature="e#24354#25639#0#PHP" expanded="false" />
+            <element signature="e#25645#26002#0#PHP" expanded="false" />
+            <element signature="e#26007#26990#0#PHP" expanded="false" />
+            <element signature="e#26996#27348#0#PHP" expanded="false" />
+            <element signature="e#27353#28462#0#PHP" expanded="false" />
+            <element signature="e#28468#28823#0#PHP" expanded="false" />
+            <element signature="e#28828#30255#0#PHP" expanded="false" />
+            <element signature="e#30261#30685#0#PHP" expanded="false" />
+            <element signature="e#30690#31301#0#PHP" expanded="false" />
+            <element signature="e#31307#31803#0#PHP" expanded="false" />
+            <element signature="e#31808#35288#0#PHP" expanded="false" />
+            <element signature="e#32610#33737#0#PHP" expanded="false" />
+            <element signature="e#35294#35578#0#PHP" expanded="false" />
+            <element signature="e#35583#36219#0#PHP" expanded="false" />
+            <element signature="e#36240#36559#0#PHP" expanded="false" />
+            <element signature="e#36565#36973#0#PHP" expanded="false" />
+            <element signature="e#36979#37738#0#PHP" expanded="false" />
+            <element signature="e#37757#38621#0#PHP" expanded="false" />
+            <element signature="e#38647#39047#0#PHP" expanded="false" />
+            <element signature="e#39070#39643#0#PHP" expanded="false" />
+            <element signature="e#39666#40476#0#PHP" expanded="false" />
+            <element signature="e#40482#41081#0#PHP" expanded="false" />
+            <element signature="e#41086#42050#0#PHP" expanded="false" />
+            <element signature="e#42056#42723#0#PHP" expanded="false" />
+            <element signature="e#42728#43769#0#PHP" expanded="false" />
+            <element signature="e#43775#44438#0#PHP" expanded="false" />
+            <element signature="e#44443#45470#0#PHP" expanded="false" />
+            <element signature="e#45477#45908#0#PHP" expanded="false" />
+            <element signature="e#45913#46491#0#PHP" expanded="false" />
+            <element signature="e#46497#46926#0#PHP" expanded="false" />
+            <element signature="e#46931#47533#0#PHP" expanded="false" />
+            <element signature="e#47539#47966#0#PHP" expanded="false" />
+            <element signature="e#47971#48537#0#PHP" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
--- a/api/index/controller/UserController.php
查看文件 @f02d576
+++ b/api/index/controller/UserController.php
查看文件 @f02d576
@@ -502,8 +502,9 @@ class UserController extends RestBaseController
         if($data['status'] == 1 || $data['status'] == 0){
             $data['serve'] = $serve['fee'];
         }else{
+            $data['serve'] = $res['fee'];
             $data['get_integral'] = $res['get_integral']-(ceil($res['get_integral']*(5/100)));
-            $data['serve'] = ceil($res['get_integral']*(5/100));
+
         }
         $this->success('SUCCESS',$data);
     }
@@ -1059,6 +1060,7 @@ class UserController extends RestBaseController
                 Db::name('detail')->insertGetId($ji);
             }
         }
+
         $res['num'] = $info['num'] + 1;
         $res['add_total'] = $info['add_total'] + $get_integral;
         $res['now_integral'] = $info['now_integral'] + $get_integral;
@@ -1072,9 +1074,11 @@ class UserController extends RestBaseController
         if($fee['fee'] == 0){
             //没有服务费
             $detail['total'] = $get_integral;
+            $sub['fee'] = 0;
         }else{
             //有服务费
-            $detail['total'] = $get_integral-($get_integral*(5/100));
+            $detail['total'] = $get_integral-($get_integral*($fee['fee']/100));
+            $sub['fee'] = $get_integral*($fee['fee']/100);
         }
         $detail['create_time'] = time();
         $detail['type'] = 5;
@@ -1083,7 +1087,7 @@ class UserController extends RestBaseController
         try{
             $result = Db::name('subscribe')
                 ->where('id',$order_id)
-                ->update(['status'=>2,'get_integral'=>$get_integral]);
+                ->update(['status'=>2,'get_integral'=>$get_integral,'fee'=>$sub['fee']]);
             $integral = Db::name('integral')
                 ->where('user_id',$order['user_id'])
                 ->update($res);