郭盛 / scrap · 提交

转到一个项目

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

修改回收员订单中的时间戳

内嵌 并排对比
正在显示 2 个修改的文件 包含 170 行增加 和 107 行删除
... ... @@ -2,10 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/PointController.php" afterPath="$PROJECT_DIR$/app/admin/controller/PointController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -27,15 +24,77 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ShoporderController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.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="400">
<caret line="116" column="5" lean-forward="true" selection-start-line="116" selection-start-column="5" selection-end-line="116" selection-end-column="5" />
<state relative-caret-position="180">
<caret line="812" column="29" lean-forward="false" selection-start-line="812" selection-start-column="29" selection-end-line="812" selection-end-column="29" />
<folding>
<element signature="e#265#1638#0#PHP" expanded="false" />
<element signature="e#1655#3619#0#PHP" expanded="false" />
<element signature="e#3640#4059#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#13395#15023#0#PHP" expanded="false" />
<element signature="e#15029#15485#0#PHP" expanded="false" />
<element signature="e#15490#17558#0#PHP" expanded="false" />
<element signature="e#17581#17936#0#PHP" expanded="false" />
<element signature="e#17942#18655#0#PHP" expanded="false" />
<element signature="e#18660#20117#0#PHP" expanded="false" />
<element signature="e#20123#20584#0#PHP" expanded="false" />
<element signature="e#20589#23716#0#PHP" expanded="false" />
<element signature="e#23722#24331#0#PHP" expanded="false" />
<element signature="e#24336#25621#0#PHP" expanded="false" />
<element signature="e#25627#25984#0#PHP" expanded="false" />
<element signature="e#25989#26972#0#PHP" expanded="false" />
<element signature="e#26978#27330#0#PHP" expanded="false" />
<element signature="e#28450#28805#0#PHP" expanded="false" />
<element signature="e#28810#30237#0#PHP" expanded="false" />
<element signature="e#30243#30667#0#PHP" expanded="false" />
<element signature="e#30672#31283#0#PHP" expanded="false" />
<element signature="e#31289#31785#0#PHP" expanded="false" />
<element signature="e#31790#35152#0#PHP" expanded="false" />
<element signature="e#32592#33719#0#PHP" expanded="false" />
<element signature="e#35158#35442#0#PHP" expanded="false" />
<element signature="e#35447#36083#0#PHP" expanded="false" />
<element signature="e#36104#36423#0#PHP" expanded="false" />
<element signature="e#36429#36837#0#PHP" expanded="false" />
<element signature="e#36843#37602#0#PHP" expanded="false" />
<element signature="e#37621#38485#0#PHP" expanded="false" />
<element signature="e#38511#38911#0#PHP" expanded="false" />
<element signature="e#38934#39507#0#PHP" expanded="false" />
<element signature="e#39530#40340#0#PHP" expanded="false" />
<element signature="e#40346#40945#0#PHP" expanded="false" />
<element signature="e#40950#41914#0#PHP" expanded="false" />
<element signature="e#41920#42587#0#PHP" expanded="false" />
<element signature="e#42592#43633#0#PHP" expanded="false" />
<element signature="e#43639#44302#0#PHP" expanded="false" />
<element signature="e#44307#45334#0#PHP" expanded="false" />
<element signature="e#45341#45772#0#PHP" expanded="false" />
<element signature="e#45777#46355#0#PHP" expanded="false" />
<element signature="e#46361#46790#0#PHP" expanded="false" />
<element signature="e#46795#47397#0#PHP" expanded="false" />
<element signature="e#47403#47830#0#PHP" expanded="false" />
<element signature="e#47835#48401#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -109,9 +168,9 @@
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
</option>
</component>
... ... @@ -129,11 +188,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="237" />
<option name="y" value="72" />
<component name="ProjectFrameBounds">
<option name="x" value="371" />
<option name="y" value="37" />
<option name="width" value="1618" />
<option name="height" value="1008" />
<option name="height" value="1007" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -150,7 +209,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
... ... @@ -159,15 +217,34 @@
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" 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="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="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../micro" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
... ... @@ -274,16 +351,18 @@
<workItem from="1576049946357" duration="1233000" />
<workItem from="1576056936489" duration="7947000" />
<workItem from="1576066696521" duration="5462000" />
<workItem from="1576110549014" duration="3202000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="543275000" />
<option name="totallyTimeSpent" value="546477000" />
</component>
<component name="ToolWindowManager">
<frame x="237" y="72" width="1618" height="1008" extended-state="1" />
<frame x="371" y="37" width="1618" height="1007" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18292683" 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.1508344" 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" />
... ... @@ -565,7 +644,6 @@
<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>
... ... @@ -587,10 +665,6 @@
<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="false" />
<element signature="e#262#1148#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -732,10 +806,36 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="106" column="125" lean-forward="false" selection-start-line="106" selection-start-column="125" selection-end-line="106" selection-end-column="125" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">
<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" />
</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="375">
<caret line="100" column="14" lean-forward="true" selection-start-line="100" selection-start-column="14" selection-end-line="100" selection-end-column="14" />
<folding>
<element signature="e#265#1638#0#PHP" expanded="false" />
<element signature="e#1655#3619#0#PHP" expanded="false" />
<element signature="e#3640#4059#0#PHP" expanded="false" />
</folding>
</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="268">
<caret line="595" column="0" lean-forward="true" selection-start-line="595" selection-start-column="0" selection-end-line="595" selection-end-column="0" />
<state relative-caret-position="180">
<caret line="812" column="29" lean-forward="false" selection-start-line="812" selection-start-column="29" selection-end-line="812" selection-end-column="29" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
... ... @@ -761,85 +861,47 @@
<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#13395#15027#0#PHP" expanded="false" />
<element signature="e#15033#15489#0#PHP" expanded="false" />
<element signature="e#15494#17562#0#PHP" expanded="false" />
<element signature="e#17585#17940#0#PHP" expanded="false" />
<element signature="e#17946#18659#0#PHP" expanded="false" />
<element signature="e#18664#20121#0#PHP" expanded="false" />
<element signature="e#20127#20588#0#PHP" expanded="false" />
<element signature="e#20593#23720#0#PHP" expanded="false" />
<element signature="e#23726#24335#0#PHP" expanded="false" />
<element signature="e#24340#25625#0#PHP" expanded="false" />
<element signature="e#25631#25988#0#PHP" expanded="false" />
<element signature="e#25993#26905#0#PHP" expanded="false" />
<element signature="e#26911#27263#0#PHP" expanded="false" />
<element signature="e#27268#28377#0#PHP" expanded="false" />
<element signature="e#28383#28738#0#PHP" expanded="false" />
<element signature="e#28743#30170#0#PHP" expanded="false" />
<element signature="e#30176#30600#0#PHP" expanded="false" />
<element signature="e#30605#31216#0#PHP" expanded="false" />
<element signature="e#31222#31718#0#PHP" expanded="false" />
<element signature="e#31723#35085#0#PHP" expanded="false" />
<element signature="e#32525#33652#0#PHP" expanded="false" />
<element signature="e#35091#35375#0#PHP" expanded="false" />
<element signature="e#35380#36016#0#PHP" expanded="false" />
<element signature="e#36037#36356#0#PHP" expanded="false" />
<element signature="e#36362#36770#0#PHP" expanded="false" />
<element signature="e#36776#37535#0#PHP" expanded="false" />
<element signature="e#37554#38418#0#PHP" expanded="false" />
<element signature="e#38444#38844#0#PHP" expanded="false" />
<element signature="e#38867#39440#0#PHP" expanded="false" />
<element signature="e#39463#40273#0#PHP" expanded="false" />
<element signature="e#40279#40878#0#PHP" expanded="false" />
<element signature="e#40883#41847#0#PHP" expanded="false" />
<element signature="e#41853#42520#0#PHP" expanded="false" />
<element signature="e#42525#43566#0#PHP" expanded="false" />
<element signature="e#43572#44235#0#PHP" expanded="false" />
<element signature="e#44240#45267#0#PHP" expanded="false" />
<element signature="e#45274#45705#0#PHP" expanded="false" />
<element signature="e#45710#46288#0#PHP" expanded="false" />
<element signature="e#46294#46723#0#PHP" expanded="false" />
<element signature="e#46728#47330#0#PHP" expanded="false" />
<element signature="e#47336#47763#0#PHP" expanded="false" />
<element signature="e#47768#48334#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="106" column="125" lean-forward="false" selection-start-line="106" selection-start-column="125" selection-end-line="106" selection-end-column="125" />
<folding>
<element signature="e#262#867#0#PHP" expanded="false" />
<element signature="e#2065#2422#0#PHP" expanded="false" />
<element signature="e#4089#4555#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">
<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#266#1001#0#PHP" expanded="false" />
<element signature="e#1016#2171#0#PHP" expanded="false" />
<element signature="e#2186#3928#0#PHP" expanded="false" />
<element signature="e#3943#4413#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="400">
<caret line="116" column="5" lean-forward="true" selection-start-line="116" selection-start-column="5" selection-end-line="116" selection-end-column="5" />
<folding>
<element signature="e#265#1638#0#PHP" expanded="false" />
<element signature="e#1655#3619#0#PHP" expanded="false" />
<element signature="e#3640#4059#0#PHP" expanded="false" />
<element signature="e#13395#15023#0#PHP" expanded="false" />
<element signature="e#15029#15485#0#PHP" expanded="false" />
<element signature="e#15490#17558#0#PHP" expanded="false" />
<element signature="e#17581#17936#0#PHP" expanded="false" />
<element signature="e#17942#18655#0#PHP" expanded="false" />
<element signature="e#18660#20117#0#PHP" expanded="false" />
<element signature="e#20123#20584#0#PHP" expanded="false" />
<element signature="e#20589#23716#0#PHP" expanded="false" />
<element signature="e#23722#24331#0#PHP" expanded="false" />
<element signature="e#24336#25621#0#PHP" expanded="false" />
<element signature="e#25627#25984#0#PHP" expanded="false" />
<element signature="e#25989#26972#0#PHP" expanded="false" />
<element signature="e#26978#27330#0#PHP" expanded="false" />
<element signature="e#28450#28805#0#PHP" expanded="false" />
<element signature="e#28810#30237#0#PHP" expanded="false" />
<element signature="e#30243#30667#0#PHP" expanded="false" />
<element signature="e#30672#31283#0#PHP" expanded="false" />
<element signature="e#31289#31785#0#PHP" expanded="false" />
<element signature="e#31790#35152#0#PHP" expanded="false" />
<element signature="e#32592#33719#0#PHP" expanded="false" />
<element signature="e#35158#35442#0#PHP" expanded="false" />
<element signature="e#35447#36083#0#PHP" expanded="false" />
<element signature="e#36104#36423#0#PHP" expanded="false" />
<element signature="e#36429#36837#0#PHP" expanded="false" />
<element signature="e#36843#37602#0#PHP" expanded="false" />
<element signature="e#37621#38485#0#PHP" expanded="false" />
<element signature="e#38511#38911#0#PHP" expanded="false" />
<element signature="e#38934#39507#0#PHP" expanded="false" />
<element signature="e#39530#40340#0#PHP" expanded="false" />
<element signature="e#40346#40945#0#PHP" expanded="false" />
<element signature="e#40950#41914#0#PHP" expanded="false" />
<element signature="e#41920#42587#0#PHP" expanded="false" />
<element signature="e#42592#43633#0#PHP" expanded="false" />
<element signature="e#43639#44302#0#PHP" expanded="false" />
<element signature="e#44307#45334#0#PHP" expanded="false" />
<element signature="e#45341#45772#0#PHP" expanded="false" />
<element signature="e#45777#46355#0#PHP" expanded="false" />
<element signature="e#46361#46790#0#PHP" expanded="false" />
<element signature="e#46795#47397#0#PHP" expanded="false" />
<element signature="e#47403#47830#0#PHP" expanded="false" />
<element signature="e#47835#48401#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -501,7 +501,7 @@ class UserController extends RestBaseController
$serve = Db::name('recyclefee')->where('id',1)->field('fee')->find();
$data['status'] = $res['status'];
if($data['status'] == 1 || $data['status'] == 0){
$data['serve'] = $serve['fee']."%";
$data['serve'] = $serve['fee'];
}else{
$data['serve'] = ceil($data['get_integral']*(5/100));
}
... ... @@ -821,6 +821,7 @@ class UserController extends RestBaseController
->select()
->toArray();
foreach ($data as &$v){
$v['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
$v['goods_name'] = [];
$attr_id = explode(',',$v['attr_id']);
foreach ($attr_id as &$v1){
... ...