郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 0136ba5291ff601855088d9cc87adfeb670bc23d 1 个父辈 c3d4fb7b
1 个管道 的构建 通过 耗费 1 秒

修改服务费

内嵌 并排对比
正在显示 2 个修改的文件 包含 75 行增加 和 66 行删除
@@ -2,8 +2,6 @@ @@ -2,8 +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/SubscribeController.php" afterPath="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />  
7 <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" />
8 </list> 6 </list>
9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -29,8 +27,8 @@ @@ -29,8 +27,8 @@
29 <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">
30 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 28 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
31 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
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" /> 30 + <state relative-caret-position="500">
  31 + <caret line="1027" column="43" lean-forward="true" selection-start-line="1027" selection-start-column="43" selection-end-line="1027" selection-end-column="43" />
34 <folding> 32 <folding>
35 <element signature="e#366#791#0#PHP" expanded="false" /> 33 <element signature="e#366#791#0#PHP" expanded="false" />
36 <element signature="e#796#1608#0#PHP" expanded="false" /> 34 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -75,29 +73,28 @@ @@ -75,29 +73,28 @@
75 <element signature="e#30189#30613#0#PHP" expanded="false" /> 73 <element signature="e#30189#30613#0#PHP" expanded="false" />
76 <element signature="e#30618#31229#0#PHP" expanded="false" /> 74 <element signature="e#30618#31229#0#PHP" expanded="false" />
77 <element signature="e#31235#31731#0#PHP" expanded="false" /> 75 <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" /> 76 + <element signature="e#32548#33675#0#PHP" expanded="false" />
  77 + <element signature="e#35400#35684#0#PHP" expanded="false" />
  78 + <element signature="e#35689#36325#0#PHP" expanded="false" />
  79 + <element signature="e#36346#36665#0#PHP" expanded="false" />
  80 + <element signature="e#36671#37079#0#PHP" expanded="false" />
  81 + <element signature="e#37085#37844#0#PHP" expanded="false" />
  82 + <element signature="e#37863#38727#0#PHP" expanded="false" />
  83 + <element signature="e#38753#39153#0#PHP" expanded="false" />
  84 + <element signature="e#39176#39749#0#PHP" expanded="false" />
  85 + <element signature="e#39772#40582#0#PHP" expanded="false" />
  86 + <element signature="e#40588#41187#0#PHP" expanded="false" />
  87 + <element signature="e#41192#42156#0#PHP" expanded="false" />
  88 + <element signature="e#42162#42829#0#PHP" expanded="false" />
  89 + <element signature="e#42834#43875#0#PHP" expanded="false" />
  90 + <element signature="e#43881#44544#0#PHP" expanded="false" />
  91 + <element signature="e#44549#45576#0#PHP" expanded="false" />
  92 + <element signature="e#45583#46014#0#PHP" expanded="false" />
  93 + <element signature="e#46019#46597#0#PHP" expanded="false" />
  94 + <element signature="e#46603#47032#0#PHP" expanded="false" />
  95 + <element signature="e#47037#47639#0#PHP" expanded="false" />
  96 + <element signature="e#47645#48072#0#PHP" expanded="false" />
  97 + <element signature="e#48077#48643#0#PHP" expanded="false" />
101 </folding> 98 </folding>
102 </state> 99 </state>
103 </provider> 100 </provider>
@@ -191,9 +188,9 @@ @@ -191,9 +188,9 @@
191 <sorting>DEFINITION_ORDER</sorting> 188 <sorting>DEFINITION_ORDER</sorting>
192 </component> 189 </component>
193 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 190 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
194 - <component name="ProjectFrameBounds">  
195 - <option name="x" value="249" />  
196 - <option name="y" value="26" /> 191 + <component name="ProjectFrameBounds" extendedState="1">
  192 + <option name="x" value="6" />
  193 + <option name="y" value="76" />
197 <option name="width" value="1618" /> 194 <option name="width" value="1618" />
198 <option name="height" value="1096" /> 195 <option name="height" value="1096" />
199 </component> 196 </component>
@@ -360,15 +357,15 @@ @@ -360,15 +357,15 @@
360 <workItem from="1576298110450" duration="8414000" /> 357 <workItem from="1576298110450" duration="8414000" />
361 <workItem from="1576455946584" duration="1141000" /> 358 <workItem from="1576455946584" duration="1141000" />
362 <workItem from="1576459063836" duration="389000" /> 359 <workItem from="1576459063836" duration="389000" />
363 - <workItem from="1576463908857" duration="935000" /> 360 + <workItem from="1576463908857" duration="1619000" />
364 </task> 361 </task>
365 <servers /> 362 <servers />
366 </component> 363 </component>
367 <component name="TimeTrackingManager"> 364 <component name="TimeTrackingManager">
368 - <option name="totallyTimeSpent" value="574967000" /> 365 + <option name="totallyTimeSpent" value="575651000" />
369 </component> 366 </component>
370 <component name="ToolWindowManager"> 367 <component name="ToolWindowManager">
371 - <frame x="249" y="26" width="1618" height="1096" extended-state="0" /> 368 + <frame x="6" y="76" width="1618" height="1096" extended-state="1" />
372 <editor active="true" /> 369 <editor active="true" />
373 <layout> 370 <layout>
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="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" />
@@ -639,13 +636,6 @@ @@ -639,13 +636,6 @@
639 </state> 636 </state>
640 </provider> 637 </provider>
641 </entry> 638 </entry>
642 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">  
643 - <provider selected="true" editor-type-id="text-editor">  
644 - <state relative-caret-position="506">  
645 - <caret line="107" column="14" lean-forward="true" selection-start-line="107" selection-start-column="14" selection-end-line="107" selection-end-column="14" />  
646 - </state>  
647 - </provider>  
648 - </entry>  
649 <entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php"> 639 <entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">
650 <provider selected="true" editor-type-id="text-editor"> 640 <provider selected="true" editor-type-id="text-editor">
651 <state relative-caret-position="127"> 641 <state relative-caret-position="127">
@@ -807,10 +797,29 @@ @@ -807,10 +797,29 @@
807 </state> 797 </state>
808 </provider> 798 </provider>
809 </entry> 799 </entry>
  800 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
  801 + <provider selected="true" editor-type-id="text-editor">
  802 + <state relative-caret-position="609">
  803 + <caret line="178" column="0" lean-forward="true" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
  804 + <folding>
  805 + <element signature="e#336#608#0#PHP" expanded="false" />
  806 + <element signature="e#614#976#0#PHP" expanded="false" />
  807 + <element signature="e#981#2020#0#PHP" expanded="false" />
  808 + <element signature="e#2026#2263#0#PHP" expanded="false" />
  809 + <element signature="e#2268#3049#0#PHP" expanded="false" />
  810 + <element signature="e#3055#3364#0#PHP" expanded="false" />
  811 + <element signature="e#3369#5259#0#PHP" expanded="false" />
  812 + <element signature="e#5267#5746#0#PHP" expanded="false" />
  813 + <element signature="e#5751#6318#0#PHP" expanded="false" />
  814 + <element signature="e#6324#6577#0#PHP" expanded="false" />
  815 + </folding>
  816 + </state>
  817 + </provider>
  818 + </entry>
810 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 819 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
811 <provider selected="true" editor-type-id="text-editor"> 820 <provider selected="true" editor-type-id="text-editor">
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" /> 821 + <state relative-caret-position="500">
  822 + <caret line="1027" column="43" lean-forward="true" selection-start-line="1027" selection-start-column="43" selection-end-line="1027" selection-end-column="43" />
814 <folding> 823 <folding>
815 <element signature="e#366#791#0#PHP" expanded="false" /> 824 <element signature="e#366#791#0#PHP" expanded="false" />
816 <element signature="e#796#1608#0#PHP" expanded="false" /> 825 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -855,29 +864,28 @@ @@ -855,29 +864,28 @@
855 <element signature="e#30189#30613#0#PHP" expanded="false" /> 864 <element signature="e#30189#30613#0#PHP" expanded="false" />
856 <element signature="e#30618#31229#0#PHP" expanded="false" /> 865 <element signature="e#30618#31229#0#PHP" expanded="false" />
857 <element signature="e#31235#31731#0#PHP" expanded="false" /> 866 <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" /> 867 + <element signature="e#32548#33675#0#PHP" expanded="false" />
  868 + <element signature="e#35400#35684#0#PHP" expanded="false" />
  869 + <element signature="e#35689#36325#0#PHP" expanded="false" />
  870 + <element signature="e#36346#36665#0#PHP" expanded="false" />
  871 + <element signature="e#36671#37079#0#PHP" expanded="false" />
  872 + <element signature="e#37085#37844#0#PHP" expanded="false" />
  873 + <element signature="e#37863#38727#0#PHP" expanded="false" />
  874 + <element signature="e#38753#39153#0#PHP" expanded="false" />
  875 + <element signature="e#39176#39749#0#PHP" expanded="false" />
  876 + <element signature="e#39772#40582#0#PHP" expanded="false" />
  877 + <element signature="e#40588#41187#0#PHP" expanded="false" />
  878 + <element signature="e#41192#42156#0#PHP" expanded="false" />
  879 + <element signature="e#42162#42829#0#PHP" expanded="false" />
  880 + <element signature="e#42834#43875#0#PHP" expanded="false" />
  881 + <element signature="e#43881#44544#0#PHP" expanded="false" />
  882 + <element signature="e#44549#45576#0#PHP" expanded="false" />
  883 + <element signature="e#45583#46014#0#PHP" expanded="false" />
  884 + <element signature="e#46019#46597#0#PHP" expanded="false" />
  885 + <element signature="e#46603#47032#0#PHP" expanded="false" />
  886 + <element signature="e#47037#47639#0#PHP" expanded="false" />
  887 + <element signature="e#47645#48072#0#PHP" expanded="false" />
  888 + <element signature="e#48077#48643#0#PHP" expanded="false" />
881 </folding> 889 </folding>
882 </state> 890 </state>
883 </provider> 891 </provider>
@@ -1025,7 +1025,7 @@ class UserController extends RestBaseController @@ -1025,7 +1025,7 @@ class UserController extends RestBaseController
1025 //通过传入的订单ID来算出该订单的用户ID 1025 //通过传入的订单ID来算出该订单的用户ID
1026 $order = Db::name('subscribe') 1026 $order = Db::name('subscribe')
1027 ->where('id',$order_id) 1027 ->where('id',$order_id)
1028 - ->field('id,user_id') 1028 + ->field('id,user_id,fee_money')
1029 ->find(); 1029 ->find();
1030 //通过查出来的用户ID来算出该用户的积分信息 1030 //通过查出来的用户ID来算出该用户的积分信息
1031 $info = Db::name('integral') 1031 $info = Db::name('integral')
@@ -1060,6 +1060,7 @@ class UserController extends RestBaseController @@ -1060,6 +1060,7 @@ class UserController extends RestBaseController
1060 Db::name('detail')->insertGetId($ji); 1060 Db::name('detail')->insertGetId($ji);
1061 } 1061 }
1062 } 1062 }
  1063 +
1063 //添加对应的积分明细 1064 //添加对应的积分明细
1064 $detail['user_id'] = $order['user_id']; 1065 $detail['user_id'] = $order['user_id'];
1065 //判断是否存在服务费 1066 //判断是否存在服务费