郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 5c492a19430e99109114a9c3ad189212987c175a 1 个父辈 a10ac1fc
1 个管道 的构建 通过 耗费 0 秒

修改回收员积分

内嵌 并排对比
正在显示 2 个修改的文件 包含 60 行增加 和 62 行删除
... ... @@ -62,8 +62,8 @@
<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="434">
<caret line="1071" column="7" lean-forward="true" selection-start-line="1071" selection-start-column="7" selection-end-line="1071" selection-end-column="7" />
<state relative-caret-position="158">
<caret line="856" column="5" lean-forward="true" selection-start-line="856" selection-start-column="5" selection-end-line="856" selection-end-column="5" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -103,26 +103,25 @@
<element signature="e#22437#22789#0#PHP" expanded="false" />
<element signature="e#22794#23872#0#PHP" expanded="false" />
<element signature="e#23878#24233#0#PHP" expanded="false" />
<element signature="e#24238#25318#0#PHP" expanded="false" />
<element signature="e#25324#25748#0#PHP" expanded="false" />
<element signature="e#25753#26364#0#PHP" expanded="false" />
<element signature="e#26370#26866#0#PHP" expanded="false" />
<element signature="e#26871#27978#0#PHP" expanded="false" />
<element signature="e#27984#28268#0#PHP" expanded="false" />
<element signature="e#28273#28909#0#PHP" expanded="false" />
<element signature="e#28930#29249#0#PHP" expanded="false" />
<element signature="e#29255#29663#0#PHP" expanded="false" />
<element signature="e#29669#30428#0#PHP" expanded="false" />
<element signature="e#30447#31311#0#PHP" expanded="false" />
<element signature="e#31337#31737#0#PHP" expanded="false" />
<element signature="e#31760#32333#0#PHP" expanded="false" />
<element signature="e#32356#33166#0#PHP" expanded="false" />
<element signature="e#33172#33771#0#PHP" expanded="false" />
<element signature="e#33776#34740#0#PHP" expanded="false" />
<element signature="e#34746#35413#0#PHP" expanded="false" />
<element signature="e#35418#36459#0#PHP" expanded="false" />
<element signature="e#36465#37122#0#PHP" expanded="false" />
<element signature="e#37127#38144#0#PHP" expanded="false" />
<element signature="e#24238#25332#0#PHP" expanded="false" />
<element signature="e#25338#25762#0#PHP" expanded="false" />
<element signature="e#25767#26378#0#PHP" expanded="false" />
<element signature="e#26384#26880#0#PHP" expanded="false" />
<element signature="e#27998#28282#0#PHP" expanded="false" />
<element signature="e#28287#28923#0#PHP" expanded="false" />
<element signature="e#28944#29263#0#PHP" expanded="false" />
<element signature="e#29269#29677#0#PHP" expanded="false" />
<element signature="e#29683#30442#0#PHP" expanded="false" />
<element signature="e#30461#31325#0#PHP" expanded="false" />
<element signature="e#31351#31751#0#PHP" expanded="false" />
<element signature="e#31774#32347#0#PHP" expanded="false" />
<element signature="e#32370#33180#0#PHP" expanded="false" />
<element signature="e#33186#33785#0#PHP" expanded="false" />
<element signature="e#33790#34754#0#PHP" expanded="false" />
<element signature="e#34760#35427#0#PHP" expanded="false" />
<element signature="e#35432#36473#0#PHP" expanded="false" />
<element signature="e#36479#37136#0#PHP" expanded="false" />
<element signature="e#37141#38158#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -260,9 +259,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="284" />
<option name="y" value="22" />
<component name="ProjectFrameBounds">
<option name="x" value="574" />
<option name="y" value="77" />
<option name="width" value="1582" />
<option name="height" value="1021" />
</component>
... ... @@ -427,15 +426,15 @@
<workItem from="1575419186725" duration="599000" />
<workItem from="1575420787741" duration="2879000" />
<workItem from="1575431441427" duration="8414000" />
<workItem from="1575444399653" duration="7712000" />
<workItem from="1575444399653" duration="8515000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="461361000" />
<option name="totallyTimeSpent" value="462164000" />
</component>
<component name="ToolWindowManager">
<frame x="284" y="22" width="1582" height="1021" extended-state="1" />
<frame x="574" y="77" width="1582" height="1021" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.174113" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -931,8 +930,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="434">
<caret line="1071" column="7" lean-forward="true" selection-start-line="1071" selection-start-column="7" selection-end-line="1071" selection-end-column="7" />
<state relative-caret-position="158">
<caret line="856" column="5" lean-forward="true" selection-start-line="856" selection-start-column="5" selection-end-line="856" selection-end-column="5" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -972,26 +971,25 @@
<element signature="e#22437#22789#0#PHP" expanded="false" />
<element signature="e#22794#23872#0#PHP" expanded="false" />
<element signature="e#23878#24233#0#PHP" expanded="false" />
<element signature="e#24238#25318#0#PHP" expanded="false" />
<element signature="e#25324#25748#0#PHP" expanded="false" />
<element signature="e#25753#26364#0#PHP" expanded="false" />
<element signature="e#26370#26866#0#PHP" expanded="false" />
<element signature="e#26871#27978#0#PHP" expanded="false" />
<element signature="e#27984#28268#0#PHP" expanded="false" />
<element signature="e#28273#28909#0#PHP" expanded="false" />
<element signature="e#28930#29249#0#PHP" expanded="false" />
<element signature="e#29255#29663#0#PHP" expanded="false" />
<element signature="e#29669#30428#0#PHP" expanded="false" />
<element signature="e#30447#31311#0#PHP" expanded="false" />
<element signature="e#31337#31737#0#PHP" expanded="false" />
<element signature="e#31760#32333#0#PHP" expanded="false" />
<element signature="e#32356#33166#0#PHP" expanded="false" />
<element signature="e#33172#33771#0#PHP" expanded="false" />
<element signature="e#33776#34740#0#PHP" expanded="false" />
<element signature="e#34746#35413#0#PHP" expanded="false" />
<element signature="e#35418#36459#0#PHP" expanded="false" />
<element signature="e#36465#37122#0#PHP" expanded="false" />
<element signature="e#37127#38144#0#PHP" expanded="false" />
<element signature="e#24238#25332#0#PHP" expanded="false" />
<element signature="e#25338#25762#0#PHP" expanded="false" />
<element signature="e#25767#26378#0#PHP" expanded="false" />
<element signature="e#26384#26880#0#PHP" expanded="false" />
<element signature="e#27998#28282#0#PHP" expanded="false" />
<element signature="e#28287#28923#0#PHP" expanded="false" />
<element signature="e#28944#29263#0#PHP" expanded="false" />
<element signature="e#29269#29677#0#PHP" expanded="false" />
<element signature="e#29683#30442#0#PHP" expanded="false" />
<element signature="e#30461#31325#0#PHP" expanded="false" />
<element signature="e#31351#31751#0#PHP" expanded="false" />
<element signature="e#31774#32347#0#PHP" expanded="false" />
<element signature="e#32370#33180#0#PHP" expanded="false" />
<element signature="e#33186#33785#0#PHP" expanded="false" />
<element signature="e#33790#34754#0#PHP" expanded="false" />
<element signature="e#34760#35427#0#PHP" expanded="false" />
<element signature="e#35432#36473#0#PHP" expanded="false" />
<element signature="e#36479#37136#0#PHP" expanded="false" />
<element signature="e#37141#38158#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -790,26 +790,26 @@ class UserController extends RestBaseController
$list = Db::name('collector')
->where('user_id',$user_id)
->where('status',2)
->select()
->toArray();
->column('order_id');
foreach ($list as &$val){
$val['order_id'] = Db::name('subscribe')
->where('id',$val['order_id'])
->field('id,num,create_time,sub_time,attr_id')
$val = Db::name('subscribe')
->where('id',$val)
->field('id,num,create_time,sub_time,attr_id,get_integral')
->find();
$attr_id = explode(',',$val['order_id']['attr_id']);
$val['order_id']['attr_id'] = [];
foreach ($attr_id as &$v1){
$val['create_time'] = date('Y-m-d H:i:s',$val['create_time']);
$val['attr_id'] = explode(',',$val['attr_id']);
$val['goods_name'] = [];
foreach ($val['attr_id'] as &$v){
$v1 = Db::name('attr')
->alias('a')
->join('rgoods r','a.rgoods_id=r.id')
->field('r.rgoods_name')
->where('a.id',$v1)
->where('a.id',$v)
->find();
array_push($val['order_id']['attr_id'],$v1['rgoods_name']);
array_push($val['goods_name'],$v1['rgoods_name']);
}
$val['order_id']['attr_id'] = implode(',',$val['order_id']['attr_id']);
$val['goods_name'] = implode(',',$val['goods_name']);
}
$this->success('success',$list);
... ...