郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 8f4e2e3b93910cd479f1a77e27272a6532189aff 1 个父辈 f7d6b267
1 个管道 的构建 通过 耗费 9 秒

修改邀请人积分

内嵌 并排对比
正在显示 2 个修改的文件 包含 323 行增加 和 219 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="" />
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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" />
<option name="SHOW_DIALOG" value="false" />
... ... @@ -22,24 +25,140 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="BountyController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/admin/controller/BountyController.php">
<file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="111">
<caret line="22" column="43" lean-forward="false" selection-start-line="22" selection-start-column="43" selection-end-line="22" selection-end-column="43" />
<state relative-caret-position="-89">
<caret line="197" column="28" lean-forward="false" selection-start-line="197" selection-start-column="28" selection-end-line="197" selection-end-column="28" />
<folding>
<element signature="e#130#169#0#PHP" expanded="true" />
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4849#0#PHP" expanded="false" />
<element signature="e#4855#5051#0#PHP" expanded="false" />
<element signature="e#5056#5318#0#PHP" expanded="false" />
<element signature="e#5324#5779#0#PHP" expanded="false" />
<element signature="e#5784#6448#0#PHP" expanded="false" />
<element signature="e#6454#6797#0#PHP" expanded="false" />
<element signature="e#6802#7283#0#PHP" expanded="false" />
<element signature="e#7289#7580#0#PHP" expanded="false" />
<element signature="e#7585#7936#0#PHP" expanded="false" />
<element signature="e#7942#8295#0#PHP" expanded="false" />
<element signature="e#8300#8705#0#PHP" expanded="false" />
<element signature="e#8711#9094#0#PHP" expanded="false" />
<element signature="e#9099#9766#0#PHP" expanded="false" />
<element signature="e#9772#10216#0#PHP" expanded="false" />
<element signature="e#10221#11068#0#PHP" expanded="false" />
<element signature="e#11074#11342#0#PHP" expanded="false" />
<element signature="e#11347#11819#0#PHP" expanded="false" />
<element signature="e#11825#12131#0#PHP" expanded="false" />
<element signature="e#12136#13779#0#PHP" expanded="false" />
<element signature="e#13800#14119#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/bounty/index.html">
<file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
<folding />
<state relative-caret-position="661">
<caret line="154" column="31" lean-forward="false" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<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="957">
<caret line="1035" column="38" lean-forward="true" selection-start-line="1035" selection-start-column="38" selection-end-line="1035" selection-end-column="38" />
<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#8984#0#PHP" expanded="false" />
<element signature="e#9007#9538#0#PHP" expanded="false" />
<element signature="e#9544#9824#0#PHP" expanded="false" />
<element signature="e#9829#10221#0#PHP" expanded="false" />
<element signature="e#10227#10511#0#PHP" expanded="false" />
<element signature="e#10516#11555#0#PHP" expanded="false" />
<element signature="e#11561#11849#0#PHP" expanded="false" />
<element signature="e#11854#12889#0#PHP" expanded="false" />
<element signature="e#12895#13476#0#PHP" expanded="false" />
<element signature="e#13481#14869#0#PHP" expanded="false" />
<element signature="e#14875#15331#0#PHP" expanded="false" />
<element signature="e#15336#17299#0#PHP" expanded="false" />
<element signature="e#17322#17677#0#PHP" expanded="false" />
<element signature="e#17683#18396#0#PHP" expanded="false" />
<element signature="e#18401#19858#0#PHP" expanded="false" />
<element signature="e#19864#20325#0#PHP" expanded="false" />
<element signature="e#20330#23352#0#PHP" expanded="false" />
<element signature="e#23358#23967#0#PHP" expanded="false" />
<element signature="e#23972#25257#0#PHP" expanded="false" />
<element signature="e#25263#25620#0#PHP" expanded="false" />
<element signature="e#25625#26506#0#PHP" expanded="false" />
<element signature="e#26512#26864#0#PHP" expanded="false" />
<element signature="e#26869#27947#0#PHP" expanded="false" />
<element signature="e#27953#28308#0#PHP" expanded="false" />
<element signature="e#28313#29407#0#PHP" expanded="false" />
<element signature="e#29413#29837#0#PHP" expanded="false" />
<element signature="e#29842#30453#0#PHP" expanded="false" />
<element signature="e#30459#30955#0#PHP" expanded="false" />
<element signature="e#33769#34053#0#PHP" expanded="false" />
<element signature="e#34058#34694#0#PHP" expanded="false" />
<element signature="e#34715#35034#0#PHP" expanded="false" />
<element signature="e#35040#35448#0#PHP" expanded="false" />
<element signature="e#35454#36213#0#PHP" expanded="false" />
<element signature="e#36232#37096#0#PHP" expanded="false" />
<element signature="e#37122#37522#0#PHP" expanded="false" />
<element signature="e#37545#38118#0#PHP" expanded="false" />
<element signature="e#38141#38951#0#PHP" expanded="false" />
<element signature="e#38957#39556#0#PHP" expanded="false" />
<element signature="e#39561#40525#0#PHP" expanded="false" />
<element signature="e#40531#41198#0#PHP" expanded="false" />
<element signature="e#41203#42244#0#PHP" expanded="false" />
<element signature="e#42250#42913#0#PHP" expanded="false" />
<element signature="e#42918#43945#0#PHP" expanded="false" />
<element signature="e#43952#44383#0#PHP" expanded="false" />
<element signature="e#44388#44966#0#PHP" expanded="false" />
<element signature="e#44972#45401#0#PHP" expanded="false" />
<element signature="e#45406#46008#0#PHP" expanded="false" />
<element signature="e#46014#46441#0#PHP" expanded="false" />
<element signature="e#46446#47012#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -88,7 +207,6 @@
<option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/index/index.html" />
<option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" />
... ... @@ -111,10 +229,11 @@
<option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/FeeController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/bounty/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/BountyController.php" />
<option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
</option>
</component>
... ... @@ -132,11 +251,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="384" />
<option name="y" value="100" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="142" />
<option name="y" value="99" />
<option name="width" value="1618" />
<option name="height" value="1023" />
<option name="height" value="1008" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -164,65 +283,21 @@
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="bounty" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="fee" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -332,15 +407,15 @@
<workItem from="1575527294268" duration="10705000" />
<workItem from="1575543830603" duration="2980000" />
<workItem from="1575592067577" duration="15900000" />
<workItem from="1575615529386" duration="10461000" />
<workItem from="1575615529386" duration="13480000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="521858000" />
<option name="totallyTimeSpent" value="524877000" />
</component>
<component name="ToolWindowManager">
<frame x="384" y="100" width="1618" height="1023" extended-state="0" />
<frame x="142" y="99" width="1618" height="1008" 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.22978178" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -517,22 +592,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="669">
<caret line="153" column="7" lean-forward="true" selection-start-line="153" selection-start-column="7" selection-end-line="153" selection-end-column="7" />
<folding>
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -576,41 +635,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="150" column="29" lean-forward="false" selection-start-line="150" selection-start-column="29" selection-end-line="150" selection-end-column="29" />
<folding>
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#1506#1726#0#PHP" expanded="false" />
<element signature="e#1731#2119#0#PHP" expanded="false" />
<element signature="e#2125#2642#0#PHP" expanded="false" />
<element signature="e#2647#3162#0#PHP" expanded="false" />
<element signature="e#3168#3696#0#PHP" expanded="false" />
<element signature="e#3701#4637#0#PHP" expanded="false" />
<element signature="e#4643#4956#0#PHP" expanded="false" />
<element signature="e#4961#5336#0#PHP" expanded="false" />
<element signature="e#5342#5694#0#PHP" expanded="false" />
<element signature="e#5699#6107#0#PHP" expanded="false" />
<element signature="e#6113#6495#0#PHP" expanded="false" />
<element signature="e#6500#7170#0#PHP" expanded="false" />
<element signature="e#7176#7619#0#PHP" expanded="false" />
<element signature="e#7624#8474#0#PHP" expanded="false" />
<element signature="e#8480#8747#0#PHP" expanded="false" />
<element signature="e#8752#9227#0#PHP" expanded="false" />
<element signature="e#9233#9783#0#PHP" expanded="false" />
<element signature="e#9788#11648#0#PHP" expanded="false" />
<element signature="e#10208#10435#1#PHP" expanded="false" />
<element signature="e#10465#10696#1#PHP" expanded="false" />
<element signature="e#11654#12021#0#PHP" expanded="false" />
<element signature="e#12026#12466#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="725">
... ... @@ -782,79 +806,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="248">
<caret line="38" column="27" lean-forward="false" selection-start-line="38" selection-start-column="27" selection-end-line="38" selection-end-column="27" />
<folding>
<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#8984#0#PHP" expanded="false" />
<element signature="e#9007#9538#0#PHP" expanded="false" />
<element signature="e#9544#9824#0#PHP" expanded="false" />
<element signature="e#9829#10221#0#PHP" expanded="false" />
<element signature="e#10227#10511#0#PHP" expanded="false" />
<element signature="e#10516#11555#0#PHP" expanded="false" />
<element signature="e#11561#11849#0#PHP" expanded="false" />
<element signature="e#11854#12889#0#PHP" expanded="false" />
<element signature="e#12895#13476#0#PHP" expanded="false" />
<element signature="e#13481#14869#0#PHP" expanded="false" />
<element signature="e#14875#15331#0#PHP" expanded="false" />
<element signature="e#15336#17299#0#PHP" expanded="false" />
<element signature="e#17322#17677#0#PHP" expanded="false" />
<element signature="e#17683#18396#0#PHP" expanded="false" />
<element signature="e#18401#19858#0#PHP" expanded="false" />
<element signature="e#19864#20325#0#PHP" expanded="false" />
<element signature="e#20330#23352#0#PHP" expanded="false" />
<element signature="e#23358#23967#0#PHP" expanded="false" />
<element signature="e#23972#25257#0#PHP" expanded="false" />
<element signature="e#25263#25620#0#PHP" expanded="false" />
<element signature="e#25625#26506#0#PHP" expanded="false" />
<element signature="e#26512#26864#0#PHP" expanded="false" />
<element signature="e#26869#27947#0#PHP" expanded="false" />
<element signature="e#27953#28308#0#PHP" expanded="false" />
<element signature="e#28313#29407#0#PHP" expanded="false" />
<element signature="e#29413#29837#0#PHP" expanded="false" />
<element signature="e#29842#30453#0#PHP" expanded="false" />
<element signature="e#30459#30955#0#PHP" expanded="false" />
<element signature="e#30960#32657#0#PHP" expanded="false" />
<element signature="e#32663#32947#0#PHP" expanded="false" />
<element signature="e#32952#33588#0#PHP" expanded="false" />
<element signature="e#33609#33928#0#PHP" expanded="false" />
<element signature="e#33934#34342#0#PHP" expanded="false" />
<element signature="e#34348#35107#0#PHP" expanded="false" />
<element signature="e#35126#35990#0#PHP" expanded="false" />
<element signature="e#36016#36416#0#PHP" expanded="false" />
<element signature="e#36439#37012#0#PHP" expanded="false" />
<element signature="e#37035#37845#0#PHP" expanded="false" />
<element signature="e#37851#38450#0#PHP" expanded="false" />
<element signature="e#38455#39419#0#PHP" expanded="false" />
<element signature="e#39425#40092#0#PHP" expanded="false" />
<element signature="e#40097#41138#0#PHP" expanded="false" />
<element signature="e#41144#41807#0#PHP" expanded="false" />
<element signature="e#41812#42839#0#PHP" expanded="false" />
<element signature="e#42846#43277#0#PHP" expanded="false" />
<element signature="e#43282#43860#0#PHP" expanded="false" />
<element signature="e#43866#44295#0#PHP" expanded="false" />
<element signature="e#44300#44902#0#PHP" expanded="false" />
<element signature="e#44908#45335#0#PHP" expanded="false" />
<element signature="e#45340#45906#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="479">
... ... @@ -875,9 +826,79 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/FeeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="48" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/bounty/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/BountyController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
<folding>
<element signature="e#130#169#0#PHP" expanded="true" />
<element signature="e#262#1148#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="150" column="29" lean-forward="false" selection-start-line="150" selection-start-column="29" selection-end-line="150" selection-end-column="29" />
<folding>
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#1506#1726#0#PHP" expanded="false" />
<element signature="e#1731#2119#0#PHP" expanded="false" />
<element signature="e#2125#2642#0#PHP" expanded="false" />
<element signature="e#2647#3162#0#PHP" expanded="false" />
<element signature="e#3168#3696#0#PHP" expanded="false" />
<element signature="e#3701#4637#0#PHP" expanded="false" />
<element signature="e#4643#4956#0#PHP" expanded="false" />
<element signature="e#4961#5336#0#PHP" expanded="false" />
<element signature="e#5342#5694#0#PHP" expanded="false" />
<element signature="e#5699#6107#0#PHP" expanded="false" />
<element signature="e#6113#6495#0#PHP" expanded="false" />
<element signature="e#6500#7170#0#PHP" expanded="false" />
<element signature="e#7176#7619#0#PHP" expanded="false" />
<element signature="e#7624#8474#0#PHP" expanded="false" />
<element signature="e#8480#8747#0#PHP" expanded="false" />
<element signature="e#8752#9227#0#PHP" expanded="false" />
<element signature="e#9233#9783#0#PHP" expanded="false" />
<element signature="e#9788#11648#0#PHP" expanded="false" />
<element signature="e#10208#10435#1#PHP" expanded="false" />
<element signature="e#10465#10696#1#PHP" expanded="false" />
<element signature="e#11654#12021#0#PHP" expanded="false" />
<element signature="e#12026#12466#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-96">
<state relative-caret-position="-89">
<caret line="197" column="28" lean-forward="false" selection-start-line="197" selection-start-column="28" selection-end-line="197" selection-end-column="28" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
... ... @@ -917,36 +938,92 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/FeeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="48" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/bounty/index.html">
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
<folding />
<state relative-caret-position="661">
<caret line="154" column="31" lean-forward="false" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/BountyController.php">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="111">
<caret line="22" column="43" lean-forward="false" selection-start-line="22" selection-start-column="43" selection-end-line="22" selection-end-column="43" />
<state relative-caret-position="957">
<caret line="1035" column="38" lean-forward="true" selection-start-line="1035" selection-start-column="38" selection-end-line="1035" selection-end-column="38" />
<folding>
<element signature="e#130#169#0#PHP" expanded="true" />
<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#8984#0#PHP" expanded="false" />
<element signature="e#9007#9538#0#PHP" expanded="false" />
<element signature="e#9544#9824#0#PHP" expanded="false" />
<element signature="e#9829#10221#0#PHP" expanded="false" />
<element signature="e#10227#10511#0#PHP" expanded="false" />
<element signature="e#10516#11555#0#PHP" expanded="false" />
<element signature="e#11561#11849#0#PHP" expanded="false" />
<element signature="e#11854#12889#0#PHP" expanded="false" />
<element signature="e#12895#13476#0#PHP" expanded="false" />
<element signature="e#13481#14869#0#PHP" expanded="false" />
<element signature="e#14875#15331#0#PHP" expanded="false" />
<element signature="e#15336#17299#0#PHP" expanded="false" />
<element signature="e#17322#17677#0#PHP" expanded="false" />
<element signature="e#17683#18396#0#PHP" expanded="false" />
<element signature="e#18401#19858#0#PHP" expanded="false" />
<element signature="e#19864#20325#0#PHP" expanded="false" />
<element signature="e#20330#23352#0#PHP" expanded="false" />
<element signature="e#23358#23967#0#PHP" expanded="false" />
<element signature="e#23972#25257#0#PHP" expanded="false" />
<element signature="e#25263#25620#0#PHP" expanded="false" />
<element signature="e#25625#26506#0#PHP" expanded="false" />
<element signature="e#26512#26864#0#PHP" expanded="false" />
<element signature="e#26869#27947#0#PHP" expanded="false" />
<element signature="e#27953#28308#0#PHP" expanded="false" />
<element signature="e#28313#29407#0#PHP" expanded="false" />
<element signature="e#29413#29837#0#PHP" expanded="false" />
<element signature="e#29842#30453#0#PHP" expanded="false" />
<element signature="e#30459#30955#0#PHP" expanded="false" />
<element signature="e#33769#34053#0#PHP" expanded="false" />
<element signature="e#34058#34694#0#PHP" expanded="false" />
<element signature="e#34715#35034#0#PHP" expanded="false" />
<element signature="e#35040#35448#0#PHP" expanded="false" />
<element signature="e#35454#36213#0#PHP" expanded="false" />
<element signature="e#36232#37096#0#PHP" expanded="false" />
<element signature="e#37122#37522#0#PHP" expanded="false" />
<element signature="e#37545#38118#0#PHP" expanded="false" />
<element signature="e#38141#38951#0#PHP" expanded="false" />
<element signature="e#38957#39556#0#PHP" expanded="false" />
<element signature="e#39561#40525#0#PHP" expanded="false" />
<element signature="e#40531#41198#0#PHP" expanded="false" />
<element signature="e#41203#42244#0#PHP" expanded="false" />
<element signature="e#42250#42913#0#PHP" expanded="false" />
<element signature="e#42918#43945#0#PHP" expanded="false" />
<element signature="e#43952#44383#0#PHP" expanded="false" />
<element signature="e#44388#44966#0#PHP" expanded="false" />
<element signature="e#44972#45401#0#PHP" expanded="false" />
<element signature="e#45406#46008#0#PHP" expanded="false" />
<element signature="e#46014#46441#0#PHP" expanded="false" />
<element signature="e#46446#47012#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -997,10 +997,37 @@ class UserController extends RestBaseController
$data['create_time'] = time();
$data['status'] = 2;
//查询我的积分信息
//查询我的积分信息以及用户是否有邀请人
$info = Db::name('integral')
->where('user_id',$user_id)
->find();
if(!empty($info['inviter_id'])){
$is_have = Db::name('subscribe')
->where('user_id',$user_id)
->where('status',2)
->find();
if(empty($is_have)){
//奖励金金额
$bounty = Db::name('bounty')
->where('id',1)
->find();
//查看邀请人的积分信息
$yaoqing = Db::name('integral')
->where('user_id',$info['inviter_id'])
->find();
//当前积分
$now['now_integral'] = $yaoqing['now_integral'] + $bounty['bounty'];
$now['add_total'] = $yaoqing['add_total'] + $bounty['add_total'];
Db::name('integral')->where('user_id',$info['inviter_id'])->update($now);
//修改邀请人的积分记录
$ji['user_id'] = $info['inviter_id'];
$ji['total'] = $bounty['bounty'];
$ji['type'] = 3;
$ji['create_time'] = time();
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;
... ...