郭盛 / scrap · 提交

转到一个项目

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

修改回收员积分

内嵌 并排对比
正在显示 2 个修改的文件 包含 60 行增加 和 62 行删除
@@ -62,8 +62,8 @@ @@ -62,8 +62,8 @@
62 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true"> 62 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
63 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 63 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
64 <provider selected="true" editor-type-id="text-editor"> 64 <provider selected="true" editor-type-id="text-editor">
65 - <state relative-caret-position="434">  
66 - <caret line="1071" column="7" lean-forward="true" selection-start-line="1071" selection-start-column="7" selection-end-line="1071" selection-end-column="7" /> 65 + <state relative-caret-position="158">
  66 + <caret line="856" column="5" lean-forward="true" selection-start-line="856" selection-start-column="5" selection-end-line="856" selection-end-column="5" />
67 <folding> 67 <folding>
68 <element signature="e#366#715#0#PHP" expanded="false" /> 68 <element signature="e#366#715#0#PHP" expanded="false" />
69 <element signature="e#720#1485#0#PHP" expanded="false" /> 69 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -103,26 +103,25 @@ @@ -103,26 +103,25 @@
103 <element signature="e#22437#22789#0#PHP" expanded="false" /> 103 <element signature="e#22437#22789#0#PHP" expanded="false" />
104 <element signature="e#22794#23872#0#PHP" expanded="false" /> 104 <element signature="e#22794#23872#0#PHP" expanded="false" />
105 <element signature="e#23878#24233#0#PHP" expanded="false" /> 105 <element signature="e#23878#24233#0#PHP" expanded="false" />
106 - <element signature="e#24238#25318#0#PHP" expanded="false" />  
107 - <element signature="e#25324#25748#0#PHP" expanded="false" />  
108 - <element signature="e#25753#26364#0#PHP" expanded="false" />  
109 - <element signature="e#26370#26866#0#PHP" expanded="false" />  
110 - <element signature="e#26871#27978#0#PHP" expanded="false" />  
111 - <element signature="e#27984#28268#0#PHP" expanded="false" />  
112 - <element signature="e#28273#28909#0#PHP" expanded="false" />  
113 - <element signature="e#28930#29249#0#PHP" expanded="false" />  
114 - <element signature="e#29255#29663#0#PHP" expanded="false" />  
115 - <element signature="e#29669#30428#0#PHP" expanded="false" />  
116 - <element signature="e#30447#31311#0#PHP" expanded="false" />  
117 - <element signature="e#31337#31737#0#PHP" expanded="false" />  
118 - <element signature="e#31760#32333#0#PHP" expanded="false" />  
119 - <element signature="e#32356#33166#0#PHP" expanded="false" />  
120 - <element signature="e#33172#33771#0#PHP" expanded="false" />  
121 - <element signature="e#33776#34740#0#PHP" expanded="false" />  
122 - <element signature="e#34746#35413#0#PHP" expanded="false" />  
123 - <element signature="e#35418#36459#0#PHP" expanded="false" />  
124 - <element signature="e#36465#37122#0#PHP" expanded="false" />  
125 - <element signature="e#37127#38144#0#PHP" expanded="false" /> 106 + <element signature="e#24238#25332#0#PHP" expanded="false" />
  107 + <element signature="e#25338#25762#0#PHP" expanded="false" />
  108 + <element signature="e#25767#26378#0#PHP" expanded="false" />
  109 + <element signature="e#26384#26880#0#PHP" expanded="false" />
  110 + <element signature="e#27998#28282#0#PHP" expanded="false" />
  111 + <element signature="e#28287#28923#0#PHP" expanded="false" />
  112 + <element signature="e#28944#29263#0#PHP" expanded="false" />
  113 + <element signature="e#29269#29677#0#PHP" expanded="false" />
  114 + <element signature="e#29683#30442#0#PHP" expanded="false" />
  115 + <element signature="e#30461#31325#0#PHP" expanded="false" />
  116 + <element signature="e#31351#31751#0#PHP" expanded="false" />
  117 + <element signature="e#31774#32347#0#PHP" expanded="false" />
  118 + <element signature="e#32370#33180#0#PHP" expanded="false" />
  119 + <element signature="e#33186#33785#0#PHP" expanded="false" />
  120 + <element signature="e#33790#34754#0#PHP" expanded="false" />
  121 + <element signature="e#34760#35427#0#PHP" expanded="false" />
  122 + <element signature="e#35432#36473#0#PHP" expanded="false" />
  123 + <element signature="e#36479#37136#0#PHP" expanded="false" />
  124 + <element signature="e#37141#38158#0#PHP" expanded="false" />
126 </folding> 125 </folding>
127 </state> 126 </state>
128 </provider> 127 </provider>
@@ -260,9 +259,9 @@ @@ -260,9 +259,9 @@
260 <sorting>DEFINITION_ORDER</sorting> 259 <sorting>DEFINITION_ORDER</sorting>
261 </component> 260 </component>
262 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 261 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
263 - <component name="ProjectFrameBounds" extendedState="1">  
264 - <option name="x" value="284" />  
265 - <option name="y" value="22" /> 262 + <component name="ProjectFrameBounds">
  263 + <option name="x" value="574" />
  264 + <option name="y" value="77" />
266 <option name="width" value="1582" /> 265 <option name="width" value="1582" />
267 <option name="height" value="1021" /> 266 <option name="height" value="1021" />
268 </component> 267 </component>
@@ -427,15 +426,15 @@ @@ -427,15 +426,15 @@
427 <workItem from="1575419186725" duration="599000" /> 426 <workItem from="1575419186725" duration="599000" />
428 <workItem from="1575420787741" duration="2879000" /> 427 <workItem from="1575420787741" duration="2879000" />
429 <workItem from="1575431441427" duration="8414000" /> 428 <workItem from="1575431441427" duration="8414000" />
430 - <workItem from="1575444399653" duration="7712000" /> 429 + <workItem from="1575444399653" duration="8515000" />
431 </task> 430 </task>
432 <servers /> 431 <servers />
433 </component> 432 </component>
434 <component name="TimeTrackingManager"> 433 <component name="TimeTrackingManager">
435 - <option name="totallyTimeSpent" value="461361000" /> 434 + <option name="totallyTimeSpent" value="462164000" />
436 </component> 435 </component>
437 <component name="ToolWindowManager"> 436 <component name="ToolWindowManager">
438 - <frame x="284" y="22" width="1582" height="1021" extended-state="1" /> 437 + <frame x="574" y="77" width="1582" height="1021" extended-state="0" />
439 <editor active="true" /> 438 <editor active="true" />
440 <layout> 439 <layout>
441 <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" /> 440 <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 @@ @@ -931,8 +930,8 @@
931 </entry> 930 </entry>
932 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 931 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
933 <provider selected="true" editor-type-id="text-editor"> 932 <provider selected="true" editor-type-id="text-editor">
934 - <state relative-caret-position="434">  
935 - <caret line="1071" column="7" lean-forward="true" selection-start-line="1071" selection-start-column="7" selection-end-line="1071" selection-end-column="7" /> 933 + <state relative-caret-position="158">
  934 + <caret line="856" column="5" lean-forward="true" selection-start-line="856" selection-start-column="5" selection-end-line="856" selection-end-column="5" />
936 <folding> 935 <folding>
937 <element signature="e#366#715#0#PHP" expanded="false" /> 936 <element signature="e#366#715#0#PHP" expanded="false" />
938 <element signature="e#720#1485#0#PHP" expanded="false" /> 937 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -972,26 +971,25 @@ @@ -972,26 +971,25 @@
972 <element signature="e#22437#22789#0#PHP" expanded="false" /> 971 <element signature="e#22437#22789#0#PHP" expanded="false" />
973 <element signature="e#22794#23872#0#PHP" expanded="false" /> 972 <element signature="e#22794#23872#0#PHP" expanded="false" />
974 <element signature="e#23878#24233#0#PHP" expanded="false" /> 973 <element signature="e#23878#24233#0#PHP" expanded="false" />
975 - <element signature="e#24238#25318#0#PHP" expanded="false" />  
976 - <element signature="e#25324#25748#0#PHP" expanded="false" />  
977 - <element signature="e#25753#26364#0#PHP" expanded="false" />  
978 - <element signature="e#26370#26866#0#PHP" expanded="false" />  
979 - <element signature="e#26871#27978#0#PHP" expanded="false" />  
980 - <element signature="e#27984#28268#0#PHP" expanded="false" />  
981 - <element signature="e#28273#28909#0#PHP" expanded="false" />  
982 - <element signature="e#28930#29249#0#PHP" expanded="false" />  
983 - <element signature="e#29255#29663#0#PHP" expanded="false" />  
984 - <element signature="e#29669#30428#0#PHP" expanded="false" />  
985 - <element signature="e#30447#31311#0#PHP" expanded="false" />  
986 - <element signature="e#31337#31737#0#PHP" expanded="false" />  
987 - <element signature="e#31760#32333#0#PHP" expanded="false" />  
988 - <element signature="e#32356#33166#0#PHP" expanded="false" />  
989 - <element signature="e#33172#33771#0#PHP" expanded="false" />  
990 - <element signature="e#33776#34740#0#PHP" expanded="false" />  
991 - <element signature="e#34746#35413#0#PHP" expanded="false" />  
992 - <element signature="e#35418#36459#0#PHP" expanded="false" />  
993 - <element signature="e#36465#37122#0#PHP" expanded="false" />  
994 - <element signature="e#37127#38144#0#PHP" expanded="false" /> 974 + <element signature="e#24238#25332#0#PHP" expanded="false" />
  975 + <element signature="e#25338#25762#0#PHP" expanded="false" />
  976 + <element signature="e#25767#26378#0#PHP" expanded="false" />
  977 + <element signature="e#26384#26880#0#PHP" expanded="false" />
  978 + <element signature="e#27998#28282#0#PHP" expanded="false" />
  979 + <element signature="e#28287#28923#0#PHP" expanded="false" />
  980 + <element signature="e#28944#29263#0#PHP" expanded="false" />
  981 + <element signature="e#29269#29677#0#PHP" expanded="false" />
  982 + <element signature="e#29683#30442#0#PHP" expanded="false" />
  983 + <element signature="e#30461#31325#0#PHP" expanded="false" />
  984 + <element signature="e#31351#31751#0#PHP" expanded="false" />
  985 + <element signature="e#31774#32347#0#PHP" expanded="false" />
  986 + <element signature="e#32370#33180#0#PHP" expanded="false" />
  987 + <element signature="e#33186#33785#0#PHP" expanded="false" />
  988 + <element signature="e#33790#34754#0#PHP" expanded="false" />
  989 + <element signature="e#34760#35427#0#PHP" expanded="false" />
  990 + <element signature="e#35432#36473#0#PHP" expanded="false" />
  991 + <element signature="e#36479#37136#0#PHP" expanded="false" />
  992 + <element signature="e#37141#38158#0#PHP" expanded="false" />
995 </folding> 993 </folding>
996 </state> 994 </state>
997 </provider> 995 </provider>
@@ -790,26 +790,26 @@ class UserController extends RestBaseController @@ -790,26 +790,26 @@ class UserController extends RestBaseController
790 $list = Db::name('collector') 790 $list = Db::name('collector')
791 ->where('user_id',$user_id) 791 ->where('user_id',$user_id)
792 ->where('status',2) 792 ->where('status',2)
793 - ->select()  
794 - ->toArray(); 793 + ->column('order_id');
795 foreach ($list as &$val){ 794 foreach ($list as &$val){
796 - $val['order_id'] = Db::name('subscribe')  
797 - ->where('id',$val['order_id'])  
798 - ->field('id,num,create_time,sub_time,attr_id') 795 + $val = Db::name('subscribe')
  796 + ->where('id',$val)
  797 + ->field('id,num,create_time,sub_time,attr_id,get_integral')
799 ->find(); 798 ->find();
800 - $attr_id = explode(',',$val['order_id']['attr_id']);  
801 -  
802 - $val['order_id']['attr_id'] = [];  
803 - foreach ($attr_id as &$v1){ 799 + $val['create_time'] = date('Y-m-d H:i:s',$val['create_time']);
  800 + $val['attr_id'] = explode(',',$val['attr_id']);
  801 + $val['goods_name'] = [];
  802 + foreach ($val['attr_id'] as &$v){
804 $v1 = Db::name('attr') 803 $v1 = Db::name('attr')
805 ->alias('a') 804 ->alias('a')
806 ->join('rgoods r','a.rgoods_id=r.id') 805 ->join('rgoods r','a.rgoods_id=r.id')
807 ->field('r.rgoods_name') 806 ->field('r.rgoods_name')
808 - ->where('a.id',$v1) 807 + ->where('a.id',$v)
809 ->find(); 808 ->find();
810 - array_push($val['order_id']['attr_id'],$v1['rgoods_name']); 809 + array_push($val['goods_name'],$v1['rgoods_name']);
  810 +
811 } 811 }
812 - $val['order_id']['attr_id'] = implode(',',$val['order_id']['attr_id']); 812 + $val['goods_name'] = implode(',',$val['goods_name']);
813 } 813 }
814 $this->success('success',$list); 814 $this->success('success',$list);
815 815