郭盛 / scrap · 提交

转到一个项目

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

修改回收完成订单后加到回收员账号上问题

内嵌 并排对比
正在显示 2 个修改的文件 包含 114 行增加 和 176 行删除
@@ -2,7 +2,8 @@ @@ -2,7 +2,8 @@
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$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 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" />
6 </list> 7 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -27,8 +28,8 @@ @@ -27,8 +28,8 @@
27 <file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false"> 28 <file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">
28 <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"> 29 <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
29 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
30 - <state relative-caret-position="576">  
31 - <caret line="136" column="0" lean-forward="true" selection-start-line="136" selection-start-column="0" selection-end-line="136" selection-end-column="0" /> 31 + <state relative-caret-position="25">
  32 + <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
32 <folding> 33 <folding>
33 <element signature="e#305#577#0#PHP" expanded="false" /> 34 <element signature="e#305#577#0#PHP" expanded="false" />
34 <element signature="e#583#854#0#PHP" expanded="false" /> 35 <element signature="e#583#854#0#PHP" expanded="false" />
@@ -44,44 +45,11 @@ @@ -44,44 +45,11 @@
44 </provider> 45 </provider>
45 </entry> 46 </entry>
46 </file> 47 </file>
47 - <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">  
48 - <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">  
49 - <provider selected="true" editor-type-id="text-editor">  
50 - <state relative-caret-position="435">  
51 - <caret line="69" column="17" lean-forward="false" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" />  
52 - <folding>  
53 - <element signature="e#411#604#0#PHP" expanded="false" />  
54 - <element signature="e#609#825#0#PHP" expanded="false" />  
55 - <element signature="e#2099#2317#0#PHP" expanded="false" />  
56 - <element signature="e#2322#2530#0#PHP" expanded="false" />  
57 - <element signature="e#2536#3043#0#PHP" expanded="false" />  
58 - <element signature="e#3048#3566#0#PHP" expanded="false" />  
59 - <element signature="e#3572#4084#0#PHP" expanded="false" />  
60 - <element signature="e#4089#4652#0#PHP" expanded="false" />  
61 - <element signature="e#4658#5248#0#PHP" expanded="false" />  
62 - <element signature="e#5253#6299#0#PHP" expanded="false" />  
63 - <element signature="e#6305#6623#0#PHP" expanded="false" />  
64 - <element signature="e#6628#7004#0#PHP" expanded="false" />  
65 - <element signature="e#7010#7365#0#PHP" expanded="false" />  
66 - <element signature="e#7370#7779#0#PHP" expanded="false" />  
67 - <element signature="e#7785#8170#0#PHP" expanded="false" />  
68 - <element signature="e#8175#8846#0#PHP" expanded="false" />  
69 - <element signature="e#8852#9298#0#PHP" expanded="false" />  
70 - <element signature="e#9303#10154#0#PHP" expanded="false" />  
71 - <element signature="e#10160#10430#0#PHP" expanded="false" />  
72 - <element signature="e#10435#10911#0#PHP" expanded="false" />  
73 - <element signature="e#10917#11547#0#PHP" expanded="false" />  
74 - <element signature="e#11552#13484#0#PHP" expanded="false" />  
75 - </folding>  
76 - </state>  
77 - </provider>  
78 - </entry>  
79 - </file>  
80 - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false"> 48 + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
81 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 49 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
82 <provider selected="true" editor-type-id="text-editor"> 50 <provider selected="true" editor-type-id="text-editor">
83 - <state relative-caret-position="259">  
84 - <caret line="1040" column="39" lean-forward="true" selection-start-line="1040" selection-start-column="39" selection-end-line="1040" selection-end-column="39" /> 51 + <state relative-caret-position="210">
  52 + <caret line="953" column="7" lean-forward="true" selection-start-line="953" selection-start-column="7" selection-end-line="953" selection-end-column="7" />
85 <folding> 53 <folding>
86 <element signature="e#366#791#0#PHP" expanded="false" /> 54 <element signature="e#366#791#0#PHP" expanded="false" />
87 <element signature="e#796#1608#0#PHP" expanded="false" /> 55 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -126,28 +94,29 @@ @@ -126,28 +94,29 @@
126 <element signature="e#29715#30139#0#PHP" expanded="false" /> 94 <element signature="e#29715#30139#0#PHP" expanded="false" />
127 <element signature="e#30144#30755#0#PHP" expanded="false" /> 95 <element signature="e#30144#30755#0#PHP" expanded="false" />
128 <element signature="e#30761#31257#0#PHP" expanded="false" /> 96 <element signature="e#30761#31257#0#PHP" expanded="false" />
129 - <element signature="e#31838#32925#0#PHP" expanded="false" />  
130 - <element signature="e#34071#34355#0#PHP" expanded="false" />  
131 - <element signature="e#34360#34996#0#PHP" expanded="false" />  
132 - <element signature="e#35017#35336#0#PHP" expanded="false" />  
133 - <element signature="e#35342#35750#0#PHP" expanded="false" />  
134 - <element signature="e#35756#36515#0#PHP" expanded="false" />  
135 - <element signature="e#36534#37398#0#PHP" expanded="false" />  
136 - <element signature="e#37424#37824#0#PHP" expanded="false" />  
137 - <element signature="e#37847#38420#0#PHP" expanded="false" />  
138 - <element signature="e#38443#39253#0#PHP" expanded="false" />  
139 - <element signature="e#39259#39858#0#PHP" expanded="false" />  
140 - <element signature="e#39863#40827#0#PHP" expanded="false" />  
141 - <element signature="e#40833#41500#0#PHP" expanded="false" />  
142 - <element signature="e#41505#42546#0#PHP" expanded="false" />  
143 - <element signature="e#42552#43215#0#PHP" expanded="false" />  
144 - <element signature="e#43220#44247#0#PHP" expanded="false" />  
145 - <element signature="e#44254#44685#0#PHP" expanded="false" />  
146 - <element signature="e#44690#45268#0#PHP" expanded="false" />  
147 - <element signature="e#45274#45703#0#PHP" expanded="false" />  
148 - <element signature="e#45708#46310#0#PHP" expanded="false" />  
149 - <element signature="e#46316#46743#0#PHP" expanded="false" />  
150 - <element signature="e#46748#47314#0#PHP" expanded="false" /> 97 + <element signature="e#31262#34624#0#PHP" expanded="false" />
  98 + <element signature="e#32064#33191#0#PHP" expanded="false" />
  99 + <element signature="e#34630#34914#0#PHP" expanded="false" />
  100 + <element signature="e#34919#35555#0#PHP" expanded="false" />
  101 + <element signature="e#35576#35895#0#PHP" expanded="false" />
  102 + <element signature="e#35901#36309#0#PHP" expanded="false" />
  103 + <element signature="e#36315#37074#0#PHP" expanded="false" />
  104 + <element signature="e#37093#37957#0#PHP" expanded="false" />
  105 + <element signature="e#37983#38383#0#PHP" expanded="false" />
  106 + <element signature="e#38406#38979#0#PHP" expanded="false" />
  107 + <element signature="e#39002#39812#0#PHP" expanded="false" />
  108 + <element signature="e#39818#40417#0#PHP" expanded="false" />
  109 + <element signature="e#40422#41386#0#PHP" expanded="false" />
  110 + <element signature="e#41392#42059#0#PHP" expanded="false" />
  111 + <element signature="e#42064#43105#0#PHP" expanded="false" />
  112 + <element signature="e#43111#43774#0#PHP" expanded="false" />
  113 + <element signature="e#43779#44806#0#PHP" expanded="false" />
  114 + <element signature="e#44813#45244#0#PHP" expanded="false" />
  115 + <element signature="e#45249#45827#0#PHP" expanded="false" />
  116 + <element signature="e#45833#46262#0#PHP" expanded="false" />
  117 + <element signature="e#46267#46869#0#PHP" expanded="false" />
  118 + <element signature="e#46875#47302#0#PHP" expanded="false" />
  119 + <element signature="e#47307#47873#0#PHP" expanded="false" />
151 </folding> 120 </folding>
152 </state> 121 </state>
153 </provider> 122 </provider>
@@ -220,10 +189,10 @@ @@ -220,10 +189,10 @@
220 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" /> 189 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
221 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" /> 190 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
222 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" /> 191 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
223 - <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />  
224 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" /> 192 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
225 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 193 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
226 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 194 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
  195 + <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
227 </list> 196 </list>
228 </option> 197 </option>
229 </component> 198 </component>
@@ -242,10 +211,10 @@ @@ -242,10 +211,10 @@
242 </component> 211 </component>
243 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 212 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
244 <component name="ProjectFrameBounds"> 213 <component name="ProjectFrameBounds">
245 - <option name="x" value="359" />  
246 - <option name="y" value="102" /> 214 + <option name="x" value="483" />
  215 + <option name="y" value="69" />
247 <option name="width" value="1618" /> 216 <option name="width" value="1618" />
248 - <option name="height" value="1013" /> 217 + <option name="height" value="1024" />
249 </component> 218 </component>
250 <component name="ProjectView"> 219 <component name="ProjectView">
251 <navigator currentView="ProjectPane" proportions="" version="1"> 220 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -402,27 +371,28 @@ @@ -402,27 +371,28 @@
402 <workItem from="1575860170691" duration="607000" /> 371 <workItem from="1575860170691" duration="607000" />
403 <workItem from="1576027263250" duration="3000" /> 372 <workItem from="1576027263250" duration="3000" />
404 <workItem from="1576049946357" duration="1233000" /> 373 <workItem from="1576049946357" duration="1233000" />
405 - <workItem from="1576056936489" duration="6220000" /> 374 + <workItem from="1576056936489" duration="7947000" />
  375 + <workItem from="1576066696521" duration="71000" />
406 </task> 376 </task>
407 <servers /> 377 <servers />
408 </component> 378 </component>
409 <component name="TimeTrackingManager"> 379 <component name="TimeTrackingManager">
410 - <option name="totallyTimeSpent" value="536086000" /> 380 + <option name="totallyTimeSpent" value="537884000" />
411 </component> 381 </component>
412 <component name="ToolWindowManager"> 382 <component name="ToolWindowManager">
413 - <frame x="359" y="102" width="1618" height="1013" extended-state="0" /> 383 + <frame x="483" y="69" width="1618" height="1024" extended-state="0" />
414 <editor active="true" /> 384 <editor active="true" />
415 <layout> 385 <layout>
416 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24582799" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 386 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18292683" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
417 <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" /> 387 <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" />
418 <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" /> 388 <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" />
419 <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" /> 389 <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" />
420 - <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" />  
421 <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" /> 390 <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" />
  391 + <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" />
422 <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" /> 392 <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" />
423 <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" /> 393 <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" />
424 - <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" />  
425 <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" /> 394 <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" />
  395 + <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" />
426 <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" /> 396 <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" />
427 <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" /> 397 <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" />
428 <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" /> 398 <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" />
@@ -723,7 +693,6 @@ @@ -723,7 +693,6 @@
723 <provider selected="true" editor-type-id="text-editor"> 693 <provider selected="true" editor-type-id="text-editor">
724 <state relative-caret-position="400"> 694 <state relative-caret-position="400">
725 <caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" /> 695 <caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
726 - <folding />  
727 </state> 696 </state>
728 </provider> 697 </provider>
729 </entry> 698 </entry>
@@ -745,10 +714,6 @@ @@ -745,10 +714,6 @@
745 <provider selected="true" editor-type-id="text-editor"> 714 <provider selected="true" editor-type-id="text-editor">
746 <state relative-caret-position="300"> 715 <state relative-caret-position="300">
747 <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" /> 716 <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
748 - <folding>  
749 - <element signature="e#130#169#0#PHP" expanded="false" />  
750 - <element signature="e#262#1148#0#PHP" expanded="false" />  
751 - </folding>  
752 </state> 717 </state>
753 </provider> 718 </provider>
754 </entry> 719 </entry>
@@ -784,11 +749,6 @@ @@ -784,11 +749,6 @@
784 <provider selected="true" editor-type-id="text-editor"> 749 <provider selected="true" editor-type-id="text-editor">
785 <state relative-caret-position="325"> 750 <state relative-caret-position="325">
786 <caret line="60" column="12" lean-forward="false" selection-start-line="60" selection-start-column="12" selection-end-line="62" selection-end-column="31" /> 751 <caret line="60" column="12" lean-forward="false" selection-start-line="60" selection-start-column="12" selection-end-line="62" selection-end-column="31" />
787 - <folding>  
788 - <element signature="e#262#867#0#PHP" expanded="false" />  
789 - <element signature="e#2477#4124#0#PHP" expanded="false" />  
790 - <element signature="e#4139#4605#0#PHP" expanded="false" />  
791 - </folding>  
792 </state> 752 </state>
793 </provider> 753 </provider>
794 </entry> 754 </entry>
@@ -796,20 +756,6 @@ @@ -796,20 +756,6 @@
796 <provider selected="true" editor-type-id="text-editor"> 756 <provider selected="true" editor-type-id="text-editor">
797 <state relative-caret-position="139"> 757 <state relative-caret-position="139">
798 <caret line="243" column="29" lean-forward="false" selection-start-line="243" selection-start-column="29" selection-end-line="243" selection-end-column="29" /> 758 <caret line="243" column="29" lean-forward="false" selection-start-line="243" selection-start-column="29" selection-end-line="243" selection-end-column="29" />
799 - <folding>  
800 - <element signature="e#4855#5051#0#PHP" expanded="false" />  
801 - <element signature="e#5056#5318#0#PHP" expanded="false" />  
802 - <element signature="e#5324#5779#0#PHP" expanded="false" />  
803 - <element signature="e#5784#6508#0#PHP" expanded="false" />  
804 - <element signature="e#6514#6857#0#PHP" expanded="false" />  
805 - <element signature="e#6862#7343#0#PHP" expanded="false" />  
806 - <element signature="e#7349#7640#0#PHP" expanded="false" />  
807 - <element signature="e#7645#7996#0#PHP" expanded="false" />  
808 - <element signature="e#8002#8355#0#PHP" expanded="false" />  
809 - <element signature="e#8360#8765#0#PHP" expanded="false" />  
810 - <element signature="e#8771#9154#0#PHP" expanded="false" />  
811 - <element signature="e#9159#9826#0#PHP" expanded="false" />  
812 - </folding>  
813 </state> 759 </state>
814 </provider> 760 </provider>
815 </entry> 761 </entry>
@@ -817,16 +763,38 @@ @@ -817,16 +763,38 @@
817 <provider selected="true" editor-type-id="text-editor"> 763 <provider selected="true" editor-type-id="text-editor">
818 <state relative-caret-position="690"> 764 <state relative-caret-position="690">
819 <caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" /> 765 <caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" />
  766 + </state>
  767 + </provider>
  768 + </entry>
  769 + <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
  770 + <provider selected="true" editor-type-id="text-editor">
  771 + <state relative-caret-position="360">
  772 + <caret line="69" column="17" lean-forward="false" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" />
  773 + </state>
  774 + </provider>
  775 + </entry>
  776 + <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
  777 + <provider selected="true" editor-type-id="text-editor">
  778 + <state relative-caret-position="25">
  779 + <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
820 <folding> 780 <folding>
821 - <element signature="e#3168#3696#0#PHP" expanded="false" /> 781 + <element signature="e#305#577#0#PHP" expanded="false" />
  782 + <element signature="e#583#854#0#PHP" expanded="false" />
  783 + <element signature="e#859#1113#0#PHP" expanded="false" />
  784 + <element signature="e#1119#1594#0#PHP" expanded="false" />
  785 + <element signature="e#1599#2490#0#PHP" expanded="false" />
  786 + <element signature="e#2497#2911#0#PHP" expanded="false" />
  787 + <element signature="e#2916#3386#0#PHP" expanded="false" />
  788 + <element signature="e#3393#3889#0#PHP" expanded="false" />
  789 + <element signature="e#3894#4897#0#PHP" expanded="false" />
822 </folding> 790 </folding>
823 </state> 791 </state>
824 </provider> 792 </provider>
825 </entry> 793 </entry>
826 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 794 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
827 <provider selected="true" editor-type-id="text-editor"> 795 <provider selected="true" editor-type-id="text-editor">
828 - <state relative-caret-position="259">  
829 - <caret line="1040" column="39" lean-forward="true" selection-start-line="1040" selection-start-column="39" selection-end-line="1040" selection-end-column="39" /> 796 + <state relative-caret-position="210">
  797 + <caret line="953" column="7" lean-forward="true" selection-start-line="953" selection-start-column="7" selection-end-line="953" selection-end-column="7" />
830 <folding> 798 <folding>
831 <element signature="e#366#791#0#PHP" expanded="false" /> 799 <element signature="e#366#791#0#PHP" expanded="false" />
832 <element signature="e#796#1608#0#PHP" expanded="false" /> 800 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -871,77 +839,29 @@ @@ -871,77 +839,29 @@
871 <element signature="e#29715#30139#0#PHP" expanded="false" /> 839 <element signature="e#29715#30139#0#PHP" expanded="false" />
872 <element signature="e#30144#30755#0#PHP" expanded="false" /> 840 <element signature="e#30144#30755#0#PHP" expanded="false" />
873 <element signature="e#30761#31257#0#PHP" expanded="false" /> 841 <element signature="e#30761#31257#0#PHP" expanded="false" />
874 - <element signature="e#31838#32925#0#PHP" expanded="false" />  
875 - <element signature="e#34071#34355#0#PHP" expanded="false" />  
876 - <element signature="e#34360#34996#0#PHP" expanded="false" />  
877 - <element signature="e#35017#35336#0#PHP" expanded="false" />  
878 - <element signature="e#35342#35750#0#PHP" expanded="false" />  
879 - <element signature="e#35756#36515#0#PHP" expanded="false" />  
880 - <element signature="e#36534#37398#0#PHP" expanded="false" />  
881 - <element signature="e#37424#37824#0#PHP" expanded="false" />  
882 - <element signature="e#37847#38420#0#PHP" expanded="false" />  
883 - <element signature="e#38443#39253#0#PHP" expanded="false" />  
884 - <element signature="e#39259#39858#0#PHP" expanded="false" />  
885 - <element signature="e#39863#40827#0#PHP" expanded="false" />  
886 - <element signature="e#40833#41500#0#PHP" expanded="false" />  
887 - <element signature="e#41505#42546#0#PHP" expanded="false" />  
888 - <element signature="e#42552#43215#0#PHP" expanded="false" />  
889 - <element signature="e#43220#44247#0#PHP" expanded="false" />  
890 - <element signature="e#44254#44685#0#PHP" expanded="false" />  
891 - <element signature="e#44690#45268#0#PHP" expanded="false" />  
892 - <element signature="e#45274#45703#0#PHP" expanded="false" />  
893 - <element signature="e#45708#46310#0#PHP" expanded="false" />  
894 - <element signature="e#46316#46743#0#PHP" expanded="false" />  
895 - <element signature="e#46748#47314#0#PHP" expanded="false" />  
896 - </folding>  
897 - </state>  
898 - </provider>  
899 - </entry>  
900 - <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">  
901 - <provider selected="true" editor-type-id="text-editor">  
902 - <state relative-caret-position="576">  
903 - <caret line="136" column="0" lean-forward="true" selection-start-line="136" selection-start-column="0" selection-end-line="136" selection-end-column="0" />  
904 - <folding>  
905 - <element signature="e#305#577#0#PHP" expanded="false" />  
906 - <element signature="e#583#854#0#PHP" expanded="false" />  
907 - <element signature="e#859#1113#0#PHP" expanded="false" />  
908 - <element signature="e#1119#1594#0#PHP" expanded="false" />  
909 - <element signature="e#1599#2490#0#PHP" expanded="false" />  
910 - <element signature="e#2497#2911#0#PHP" expanded="false" />  
911 - <element signature="e#2916#3386#0#PHP" expanded="false" />  
912 - <element signature="e#3393#3889#0#PHP" expanded="false" />  
913 - <element signature="e#3894#4897#0#PHP" expanded="false" />  
914 - </folding>  
915 - </state>  
916 - </provider>  
917 - </entry>  
918 - <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">  
919 - <provider selected="true" editor-type-id="text-editor">  
920 - <state relative-caret-position="435">  
921 - <caret line="69" column="17" lean-forward="false" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" />  
922 - <folding>  
923 - <element signature="e#411#604#0#PHP" expanded="false" />  
924 - <element signature="e#609#825#0#PHP" expanded="false" />  
925 - <element signature="e#2099#2317#0#PHP" expanded="false" />  
926 - <element signature="e#2322#2530#0#PHP" expanded="false" />  
927 - <element signature="e#2536#3043#0#PHP" expanded="false" />  
928 - <element signature="e#3048#3566#0#PHP" expanded="false" />  
929 - <element signature="e#3572#4084#0#PHP" expanded="false" />  
930 - <element signature="e#4089#4652#0#PHP" expanded="false" />  
931 - <element signature="e#4658#5248#0#PHP" expanded="false" />  
932 - <element signature="e#5253#6299#0#PHP" expanded="false" />  
933 - <element signature="e#6305#6623#0#PHP" expanded="false" />  
934 - <element signature="e#6628#7004#0#PHP" expanded="false" />  
935 - <element signature="e#7010#7365#0#PHP" expanded="false" />  
936 - <element signature="e#7370#7779#0#PHP" expanded="false" />  
937 - <element signature="e#7785#8170#0#PHP" expanded="false" />  
938 - <element signature="e#8175#8846#0#PHP" expanded="false" />  
939 - <element signature="e#8852#9298#0#PHP" expanded="false" />  
940 - <element signature="e#9303#10154#0#PHP" expanded="false" />  
941 - <element signature="e#10160#10430#0#PHP" expanded="false" />  
942 - <element signature="e#10435#10911#0#PHP" expanded="false" />  
943 - <element signature="e#10917#11547#0#PHP" expanded="false" />  
944 - <element signature="e#11552#13484#0#PHP" expanded="false" /> 842 + <element signature="e#31262#34624#0#PHP" expanded="false" />
  843 + <element signature="e#32064#33191#0#PHP" expanded="false" />
  844 + <element signature="e#34630#34914#0#PHP" expanded="false" />
  845 + <element signature="e#34919#35555#0#PHP" expanded="false" />
  846 + <element signature="e#35576#35895#0#PHP" expanded="false" />
  847 + <element signature="e#35901#36309#0#PHP" expanded="false" />
  848 + <element signature="e#36315#37074#0#PHP" expanded="false" />
  849 + <element signature="e#37093#37957#0#PHP" expanded="false" />
  850 + <element signature="e#37983#38383#0#PHP" expanded="false" />
  851 + <element signature="e#38406#38979#0#PHP" expanded="false" />
  852 + <element signature="e#39002#39812#0#PHP" expanded="false" />
  853 + <element signature="e#39818#40417#0#PHP" expanded="false" />
  854 + <element signature="e#40422#41386#0#PHP" expanded="false" />
  855 + <element signature="e#41392#42059#0#PHP" expanded="false" />
  856 + <element signature="e#42064#43105#0#PHP" expanded="false" />
  857 + <element signature="e#43111#43774#0#PHP" expanded="false" />
  858 + <element signature="e#43779#44806#0#PHP" expanded="false" />
  859 + <element signature="e#44813#45244#0#PHP" expanded="false" />
  860 + <element signature="e#45249#45827#0#PHP" expanded="false" />
  861 + <element signature="e#45833#46262#0#PHP" expanded="false" />
  862 + <element signature="e#46267#46869#0#PHP" expanded="false" />
  863 + <element signature="e#46875#47302#0#PHP" expanded="false" />
  864 + <element signature="e#47307#47873#0#PHP" expanded="false" />
945 </folding> 865 </folding>
946 </state> 866 </state>
947 </provider> 867 </provider>
@@ -1007,13 +1007,22 @@ class UserController extends RestBaseController @@ -1007,13 +1007,22 @@ class UserController extends RestBaseController
1007 $data['create_time'] = time(); 1007 $data['create_time'] = time();
1008 $data['status'] = 2; 1008 $data['status'] = 2;
1009 1009
1010 - //查询我的积分信息以及用户是否有邀请人 1010 + //查询用户积分信息以及用户是否有邀请人
  1011 +
  1012 + //通过传入的订单ID来算出该订单的用户ID
  1013 + $order = Db::name('subscribe')
  1014 + ->where('id',$order_id)
  1015 + ->field('id,user_id')
  1016 + ->find();
  1017 + //通过查出来的用户ID来算出该用户的积分信息
1011 $info = Db::name('integral') 1018 $info = Db::name('integral')
1012 - ->where('user_id',$user_id) 1019 + ->where('user_id',$order['user_id'])
1013 ->find(); 1020 ->find();
  1021 + //查询该用户是否有邀请人
1014 if(!empty($info['inviter_id'])){ 1022 if(!empty($info['inviter_id'])){
  1023 + //查询该用户是否第一次完成回收
1015 $is_have = Db::name('subscribe') 1024 $is_have = Db::name('subscribe')
1016 - ->where('user_id',$user_id) 1025 + ->where('user_id',$info['inviter_id'])
1017 ->where('status',2) 1026 ->where('status',2)
1018 ->find(); 1027 ->find();
1019 if(empty($is_have)){ 1028 if(empty($is_have)){
@@ -1043,11 +1052,20 @@ class UserController extends RestBaseController @@ -1043,11 +1052,20 @@ class UserController extends RestBaseController
1043 $res['now_integral'] = $info['now_integral'] + $get_integral; 1052 $res['now_integral'] = $info['now_integral'] + $get_integral;
1044 1053
1045 //添加对应的积分明细 1054 //添加对应的积分明细
1046 - $detail['user_id'] = $user_id;  
1047 - $detail['total'] = $get_integral; 1055 + $detail['user_id'] = $order['user_id'];
  1056 + //判断是否存在服务费
  1057 + $fee = Db::name('recyclefee')
  1058 + ->where('id',1)
  1059 + ->find();
  1060 + if($fee['fee'] == 0){
  1061 + //没有服务费
  1062 + $detail['total'] = $get_integral;
  1063 + }else{
  1064 + //有服务费
  1065 + $detail['total'] = $get_integral-($get_integral*(5/100));
  1066 + }
1048 $detail['create_time'] = time(); 1067 $detail['create_time'] = time();
1049 $detail['type'] = 5; 1068 $detail['type'] = 5;
1050 -  
1051 // 启动事务 1069 // 启动事务
1052 Db::startTrans(); 1070 Db::startTrans();
1053 try{ 1071 try{
@@ -1055,7 +1073,7 @@ class UserController extends RestBaseController @@ -1055,7 +1073,7 @@ class UserController extends RestBaseController
1055 ->where('id',$order_id) 1073 ->where('id',$order_id)
1056 ->update(['status'=>2,'get_integral'=>$get_integral]); 1074 ->update(['status'=>2,'get_integral'=>$get_integral]);
1057 $integral = Db::name('integral') 1075 $integral = Db::name('integral')
1058 - ->where('user_id',$user_id) 1076 + ->where('user_id',$order['user_id'])
1059 ->update($res); 1077 ->update($res);
1060 $detail = Db::name('detail')->insertGetId($detail); 1078 $detail = Db::name('detail')->insertGetId($detail);
1061 1079