郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 460cc05643420ba37c4478d7153031472ea6e20d 1 个父辈 c805c349 master
1 个管道 的构建 通过 耗费 1 秒

图片混合订单

内嵌 并排对比
正在显示 3 个修改的文件 包含 44 行增加 和 31 行删除
... ... @@ -17,8 +17,8 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="1116" column="0" lean-forward="true" selection-start-line="1116" selection-start-column="0" selection-end-line="1116" selection-end-column="0" />
<state relative-caret-position="304">
<caret line="1112" column="9" lean-forward="true" selection-start-line="1112" selection-start-column="9" selection-end-line="1112" selection-end-column="9" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -64,15 +64,15 @@
<element signature="e#32786#32872#0#PHP" expanded="false" />
<element signature="e#32961#33049#0#PHP" expanded="false" />
<element signature="e#34597#35357#0#PHP" expanded="false" />
<element signature="e#37207#38038#0#PHP" expanded="false" />
<element signature="e#38044#38464#0#PHP" expanded="false" />
<element signature="e#38469#38952#0#PHP" expanded="false" />
<element signature="e#38958#39764#0#PHP" expanded="false" />
<element signature="e#39769#42923#0#PHP" expanded="false" />
<element signature="e#42938#44266#0#PHP" expanded="false" />
<element signature="e#44282#45309#0#PHP" expanded="false" />
<element signature="e#45316#46074#0#PHP" expanded="false" />
<element signature="e#46079#48466#0#PHP" expanded="false" />
<element signature="e#37798#38629#0#PHP" expanded="false" />
<element signature="e#38635#39055#0#PHP" expanded="false" />
<element signature="e#39060#39543#0#PHP" expanded="false" />
<element signature="e#39549#40355#0#PHP" expanded="false" />
<element signature="e#40360#43514#0#PHP" expanded="false" />
<element signature="e#43529#44857#0#PHP" expanded="false" />
<element signature="e#44873#45900#0#PHP" expanded="false" />
<element signature="e#45907#46665#0#PHP" expanded="false" />
<element signature="e#46670#49057#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -177,8 +177,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="570" />
<option name="y" value="88" />
<option name="x" value="294" />
<option name="y" value="75" />
<option name="width" value="1806" />
<option name="height" value="981" />
</component>
... ... @@ -277,7 +277,7 @@
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="15863000" />
<workItem from="1574469667436" duration="13439000" />
<workItem from="1574469667436" duration="13682000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -290,7 +290,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="191249000" />
<option name="totallyTimeSpent" value="191492000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -302,8 +302,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="570" y="88" width="1806" height="981" extended-state="0" />
<editor active="true" />
<frame x="294" y="75" width="1806" height="981" extended-state="0" />
<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.15005727" sideWeight="0.5" order="1" 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.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
... ... @@ -312,7 +311,7 @@
<window_info id="Version Control" 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="1" side_tool="false" content_ui="tabs" />
<window_info id="Run" 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="5" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13625592" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13625592" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -709,8 +708,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="1116" column="0" lean-forward="true" selection-start-line="1116" selection-start-column="0" selection-end-line="1116" selection-end-column="0" />
<state relative-caret-position="304">
<caret line="1112" column="9" lean-forward="true" selection-start-line="1112" selection-start-column="9" selection-end-line="1112" selection-end-column="9" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -756,15 +755,15 @@
<element signature="e#32786#32872#0#PHP" expanded="false" />
<element signature="e#32961#33049#0#PHP" expanded="false" />
<element signature="e#34597#35357#0#PHP" expanded="false" />
<element signature="e#37207#38038#0#PHP" expanded="false" />
<element signature="e#38044#38464#0#PHP" expanded="false" />
<element signature="e#38469#38952#0#PHP" expanded="false" />
<element signature="e#38958#39764#0#PHP" expanded="false" />
<element signature="e#39769#42923#0#PHP" expanded="false" />
<element signature="e#42938#44266#0#PHP" expanded="false" />
<element signature="e#44282#45309#0#PHP" expanded="false" />
<element signature="e#45316#46074#0#PHP" expanded="false" />
<element signature="e#46079#48466#0#PHP" expanded="false" />
<element signature="e#37798#38629#0#PHP" expanded="false" />
<element signature="e#38635#39055#0#PHP" expanded="false" />
<element signature="e#39060#39543#0#PHP" expanded="false" />
<element signature="e#39549#40355#0#PHP" expanded="false" />
<element signature="e#40360#43514#0#PHP" expanded="false" />
<element signature="e#43529#44857#0#PHP" expanded="false" />
<element signature="e#44873#45900#0#PHP" expanded="false" />
<element signature="e#45907#46665#0#PHP" expanded="false" />
<element signature="e#46670#49057#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1096,8 +1096,22 @@ class User extends Api
}
}
$param['video_id'] = serialize($a);
$arr = Db::name('order')
->field('id,pic_id')
->where($where)
->select();
foreach ($arr as &$v){
$v['pic_id'] = explode(',',$v['pic_id']);
$param['pic_id'] = explode(',',$this->request->post('pic_id'));
if(!empty($param['pic_id'])){
foreach ($param['pic_id'] as $v3){
if(in_array($v3['pic_id'],$v['pic_id'])){
$this->error(['code'=>2,'msg'=>'该图片已经购买过了','pic_id'=>$v3['pic_id']]);
}
}
}
}
$param['pic_id'] = $this->request->post('pic_id');
$param['total'] = $this->request->post('total');
if(empty( $param['total'])){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
... ...
... ... @@ -5529,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-23 13:23:54 </div>
Generated on 2019-11-23 13:28:51 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...