郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 c805c349f9fd07d36ffc2fa7666c088b607e305d 1 个父辈 14db1379
1 个管道 的构建 通过 耗费 1 秒

修改创建订单

内嵌 并排对比
正在显示 3 个修改的文件 包含 51 行增加 和 42 行删除
... ... @@ -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="477">
<caret line="960" column="13" lean-forward="false" selection-start-line="960" selection-start-column="13" selection-end-line="960" selection-end-column="13" />
<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" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -58,21 +58,21 @@
<element signature="e#29140#29553#0#PHP" expanded="false" />
<element signature="e#29558#30037#0#PHP" expanded="false" />
<element signature="e#30043#30577#0#PHP" expanded="false" />
<element signature="e#30582#31967#0#PHP" expanded="false" />
<element signature="e#31973#32627#0#PHP" expanded="false" />
<element signature="e#32632#34585#0#PHP" expanded="false" />
<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#35362#36963#0#PHP" expanded="false" />
<element signature="e#36989#37820#0#PHP" expanded="false" />
<element signature="e#37826#38246#0#PHP" expanded="false" />
<element signature="e#38251#38734#0#PHP" expanded="false" />
<element signature="e#38740#39546#0#PHP" expanded="false" />
<element signature="e#39551#42705#0#PHP" expanded="false" />
<element signature="e#42720#44048#0#PHP" expanded="false" />
<element signature="e#44064#45091#0#PHP" expanded="false" />
<element signature="e#45098#45856#0#PHP" expanded="false" />
<element signature="e#45861#48248#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" />
</folding>
</state>
</provider>
... ... @@ -177,8 +177,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="211" />
<option name="y" value="65" />
<option name="x" value="570" />
<option name="y" value="88" />
<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="12858000" />
<workItem from="1574469667436" duration="13439000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -290,7 +290,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="190668000" />
<option name="totallyTimeSpent" value="191249000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -302,7 +302,8 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="211" y="65" width="1806" height="981" extended-state="0" />
<frame x="570" y="88" width="1806" height="981" extended-state="0" />
<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.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" />
... ... @@ -311,7 +312,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="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="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="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" />
... ... @@ -708,8 +709,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="477">
<caret line="960" column="13" lean-forward="false" selection-start-line="960" selection-start-column="13" selection-end-line="960" selection-end-column="13" />
<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" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -749,21 +750,21 @@
<element signature="e#29140#29553#0#PHP" expanded="false" />
<element signature="e#29558#30037#0#PHP" expanded="false" />
<element signature="e#30043#30577#0#PHP" expanded="false" />
<element signature="e#30582#31967#0#PHP" expanded="false" />
<element signature="e#31973#32627#0#PHP" expanded="false" />
<element signature="e#32632#34585#0#PHP" expanded="false" />
<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#35362#36963#0#PHP" expanded="false" />
<element signature="e#36989#37820#0#PHP" expanded="false" />
<element signature="e#37826#38246#0#PHP" expanded="false" />
<element signature="e#38251#38734#0#PHP" expanded="false" />
<element signature="e#38740#39546#0#PHP" expanded="false" />
<element signature="e#39551#42705#0#PHP" expanded="false" />
<element signature="e#42720#44048#0#PHP" expanded="false" />
<element signature="e#44064#45091#0#PHP" expanded="false" />
<element signature="e#45098#45856#0#PHP" expanded="false" />
<element signature="e#45861#48248#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" />
</folding>
</state>
</provider>
... ...
... ... @@ -1075,19 +1075,27 @@ class User extends Api
$key = ['id','attr'];
$a = $this->array_merge_more($key,$video_id,$video_attr);
// print_r($a);die;
foreach ($a as &$v){
$param['video_id'] = serialize($v);
$where['user_id'] = ['eq',$param['user_id']];
$where['video_id'] = ['Like',"%$param[video_id]%"];
$where['status'] = ['eq',2];
$res = Db::name('order')->where($where)->find();
if(!empty($res)){
$this->error(['code'=>2,'msg'=>'该属性视频您已经购买过了','order_id'=>$res['id']]);
}else{
$param['video_id'] = serialize($a);
$where['user_id'] = ['eq',$param['user_id']];
$where['status'] = ['eq',2];
$res = Db::name('order')
->field('video_id')
->where($where)
->select();
foreach ($res as &$v){
$v['video_id'] = unserialize($v['video_id']);
if(!empty($v['video_id'])){
foreach ($v['video_id'] as $v1){
foreach ($a as &$v2){
if($v1['id'] == $v2['id'] && $v1['attr'] == $v2['attr']){
$this->error(['code'=>2,'msg'=>'该属性的视频已经购买过了','video_id'=>$v1['id']]);
}
}
}
}
}
die;
$param['video_id'] = serialize($a);
$param['pic_id'] = $this->request->post('pic_id');
$param['total'] = $this->request->post('total');
... ...
... ... @@ -5529,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-23 13:14:33 </div>
Generated on 2019-11-23 13:23:54 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...