郭盛 / scrap · 提交

转到一个项目

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

回收员已接单订单，商城订单详情修改

内嵌 并排对比
正在显示 2 个修改的文件 包含 75 行增加 和 74 行删除
... ... @@ -63,8 +63,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="198">
<caret line="370" column="0" lean-forward="false" selection-start-line="370" selection-start-column="0" selection-end-line="371" selection-end-column="0" />
<state relative-caret-position="430">
<caret line="482" column="53" lean-forward="false" selection-start-line="482" selection-start-column="53" selection-end-line="482" selection-end-column="53" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -89,29 +89,29 @@
<element signature="e#10497#10953#0#PHP" expanded="false" />
<element signature="e#10958#12350#0#PHP" expanded="false" />
<element signature="e#12373#12725#0#PHP" expanded="false" />
<element signature="e#12731#13415#0#PHP" expanded="false" />
<element signature="e#13420#14679#0#PHP" expanded="false" />
<element signature="e#14685#15146#0#PHP" expanded="false" />
<element signature="e#15151#17356#0#PHP" expanded="false" />
<element signature="e#17362#17971#0#PHP" expanded="false" />
<element signature="e#17976#19309#0#PHP" expanded="false" />
<element signature="e#19315#19672#0#PHP" expanded="false" />
<element signature="e#20564#20916#0#PHP" expanded="false" />
<element signature="e#22026#22381#0#PHP" expanded="false" />
<element signature="e#22386#23466#0#PHP" expanded="false" />
<element signature="e#23472#23896#0#PHP" expanded="false" />
<element signature="e#23901#24512#0#PHP" expanded="false" />
<element signature="e#24518#25014#0#PHP" expanded="false" />
<element signature="e#25019#26126#0#PHP" expanded="false" />
<element signature="e#26132#26416#0#PHP" expanded="false" />
<element signature="e#26421#26999#0#PHP" expanded="false" />
<element signature="e#27020#27339#0#PHP" expanded="false" />
<element signature="e#27345#27753#0#PHP" expanded="false" />
<element signature="e#27759#28518#0#PHP" expanded="false" />
<element signature="e#28538#29402#0#PHP" expanded="false" />
<element signature="e#29429#29829#0#PHP" expanded="false" />
<element signature="e#29853#30426#0#PHP" expanded="false" />
<element signature="e#30449#31259#0#PHP" expanded="false" />
<element signature="e#14738#15199#0#PHP" expanded="false" />
<element signature="e#15204#17409#0#PHP" expanded="false" />
<element signature="e#17415#18024#0#PHP" expanded="false" />
<element signature="e#18029#19362#0#PHP" expanded="false" />
<element signature="e#19368#19725#0#PHP" expanded="false" />
<element signature="e#19730#20611#0#PHP" expanded="false" />
<element signature="e#20617#20969#0#PHP" expanded="false" />
<element signature="e#20974#22052#0#PHP" expanded="false" />
<element signature="e#22058#22413#0#PHP" expanded="false" />
<element signature="e#22418#23498#0#PHP" expanded="false" />
<element signature="e#23504#23928#0#PHP" expanded="false" />
<element signature="e#23933#24544#0#PHP" expanded="false" />
<element signature="e#24550#25046#0#PHP" expanded="false" />
<element signature="e#25051#26158#0#PHP" expanded="false" />
<element signature="e#26164#26448#0#PHP" expanded="false" />
<element signature="e#26453#27031#0#PHP" expanded="false" />
<element signature="e#27052#27371#0#PHP" expanded="false" />
<element signature="e#27377#27785#0#PHP" expanded="false" />
<element signature="e#27791#28550#0#PHP" expanded="false" />
<element signature="e#28570#29434#0#PHP" expanded="false" />
<element signature="e#29461#29861#0#PHP" expanded="false" />
<element signature="e#29885#30458#0#PHP" expanded="false" />
<element signature="e#30481#31291#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -205,11 +205,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="316" />
<option name="y" value="90" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="198" />
<option name="y" value="46" />
<option name="width" value="1582" />
<option name="height" value="1009" />
<option name="height" value="1021" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -353,15 +353,15 @@
<workItem from="1575359408189" duration="10054000" />
<workItem from="1575419186725" duration="599000" />
<workItem from="1575420787741" duration="2879000" />
<workItem from="1575431441427" duration="6582000" />
<workItem from="1575431441427" duration="8414000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="451817000" />
<option name="totallyTimeSpent" value="453649000" />
</component>
<component name="ToolWindowManager">
<frame x="316" y="90" width="1582" height="1009" extended-state="0" />
<frame x="198" y="46" width="1582" height="1021" 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.17214192" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -859,8 +859,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="370" column="0" lean-forward="false" selection-start-line="370" selection-start-column="0" selection-end-line="371" selection-end-column="0" />
<state relative-caret-position="430">
<caret line="482" column="53" lean-forward="false" selection-start-line="482" selection-start-column="53" selection-end-line="482" selection-end-column="53" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -885,29 +885,29 @@
<element signature="e#10497#10953#0#PHP" expanded="false" />
<element signature="e#10958#12350#0#PHP" expanded="false" />
<element signature="e#12373#12725#0#PHP" expanded="false" />
<element signature="e#12731#13415#0#PHP" expanded="false" />
<element signature="e#13420#14679#0#PHP" expanded="false" />
<element signature="e#14685#15146#0#PHP" expanded="false" />
<element signature="e#15151#17356#0#PHP" expanded="false" />
<element signature="e#17362#17971#0#PHP" expanded="false" />
<element signature="e#17976#19309#0#PHP" expanded="false" />
<element signature="e#19315#19672#0#PHP" expanded="false" />
<element signature="e#20564#20916#0#PHP" expanded="false" />
<element signature="e#22026#22381#0#PHP" expanded="false" />
<element signature="e#22386#23466#0#PHP" expanded="false" />
<element signature="e#23472#23896#0#PHP" expanded="false" />
<element signature="e#23901#24512#0#PHP" expanded="false" />
<element signature="e#24518#25014#0#PHP" expanded="false" />
<element signature="e#25019#26126#0#PHP" expanded="false" />
<element signature="e#26132#26416#0#PHP" expanded="false" />
<element signature="e#26421#26999#0#PHP" expanded="false" />
<element signature="e#27020#27339#0#PHP" expanded="false" />
<element signature="e#27345#27753#0#PHP" expanded="false" />
<element signature="e#27759#28518#0#PHP" expanded="false" />
<element signature="e#28538#29402#0#PHP" expanded="false" />
<element signature="e#29429#29829#0#PHP" expanded="false" />
<element signature="e#29853#30426#0#PHP" expanded="false" />
<element signature="e#30449#31259#0#PHP" expanded="false" />
<element signature="e#14738#15199#0#PHP" expanded="false" />
<element signature="e#15204#17409#0#PHP" expanded="false" />
<element signature="e#17415#18024#0#PHP" expanded="false" />
<element signature="e#18029#19362#0#PHP" expanded="false" />
<element signature="e#19368#19725#0#PHP" expanded="false" />
<element signature="e#19730#20611#0#PHP" expanded="false" />
<element signature="e#20617#20969#0#PHP" expanded="false" />
<element signature="e#20974#22052#0#PHP" expanded="false" />
<element signature="e#22058#22413#0#PHP" expanded="false" />
<element signature="e#22418#23498#0#PHP" expanded="false" />
<element signature="e#23504#23928#0#PHP" expanded="false" />
<element signature="e#23933#24544#0#PHP" expanded="false" />
<element signature="e#24550#25046#0#PHP" expanded="false" />
<element signature="e#25051#26158#0#PHP" expanded="false" />
<element signature="e#26164#26448#0#PHP" expanded="false" />
<element signature="e#26453#27031#0#PHP" expanded="false" />
<element signature="e#27052#27371#0#PHP" expanded="false" />
<element signature="e#27377#27785#0#PHP" expanded="false" />
<element signature="e#27791#28550#0#PHP" expanded="false" />
<element signature="e#28570#29434#0#PHP" expanded="false" />
<element signature="e#29461#29861#0#PHP" expanded="false" />
<element signature="e#29885#30458#0#PHP" expanded="false" />
<element signature="e#30481#31291#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -479,7 +479,8 @@ class UserController extends RestBaseController
$data['number'] = $res['number'];
$data['create_time'] = date('Y-m-d H:i:s',$res['create_time']);
$data['express_num'] = $res['express_num'];
$data['recycle_id'] = Db::name('shoprecycle')->where('id',$res['shoprecycle_id'])->column('address');
$recycle_id = Db::name('shoprecycle')->where('id',$res['shoprecycle_id'])->field('address')->find();
$data['recycle_id'] = $recycle_id['address'];
$shopgoods_id = Db::name('shopgoods')
->where('id',$res['shopgoods_id'])
->field('id,goods_name,thumbnail,freight')
... ... @@ -673,26 +674,26 @@ class UserController extends RestBaseController
$list = Db::name('collector')
->where('user_id',$user_id)
->where('status',1)
->select()
->toArray();
->column('order_id');
foreach ($list as &$val){
$val['order_id'] = Db::name('subscribe')
->where('id',$val['order_id'])
$val = Db::name('subscribe')
->where('id',$val)
->field('id,num,create_time,sub_time,attr_id')
->find();
$attr_id = explode(',',$val['order_id']['attr_id']);
$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',$v)
->find();
array_push($val['goods_name'],$v1['rgoods_name']);
// $val['order_id']['attr_id'] = [];
// foreach ($attr_id as &$v1){
// $v1 = Db::name('attr')
// ->alias('a')
// ->join('rgoods r','a.rgoods_id=r.id')
// ->field('r.rgoods_name')
// ->where('a.id',$v1)
// ->find();
// array_push($val['order_id']['attr_id'],$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);
... ...