郭盛 / areial · 提交

转到一个项目

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

购买视频

内嵌 并排对比
正在显示 3 个修改的文件 包含 47 行增加 和 34 行删除
... ... @@ -2,7 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -16,8 +18,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="491">
<caret line="1009" column="55" lean-forward="false" selection-start-line="1009" selection-start-column="55" selection-end-line="1009" selection-end-column="55" />
<state relative-caret-position="294">
<caret line="1061" column="9" lean-forward="true" selection-start-line="1061" selection-start-column="9" selection-end-line="1061" selection-end-column="9" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -59,16 +61,15 @@
<element signature="e#30043#30577#0#PHP" expanded="false" />
<element signature="e#30582#31496#0#PHP" expanded="false" />
<element signature="e#31502#32156#0#PHP" expanded="false" />
<element signature="e#33756#34516#0#PHP" expanded="false" />
<element signature="e#35622#36453#0#PHP" expanded="false" />
<element signature="e#36459#36879#0#PHP" expanded="false" />
<element signature="e#36884#37367#0#PHP" expanded="false" />
<element signature="e#37373#38179#0#PHP" expanded="false" />
<element signature="e#38184#41338#0#PHP" expanded="false" />
<element signature="e#41353#42681#0#PHP" expanded="false" />
<element signature="e#42697#43724#0#PHP" expanded="false" />
<element signature="e#43731#44489#0#PHP" expanded="false" />
<element signature="e#44494#46881#0#PHP" expanded="false" />
<element signature="e#36083#36914#0#PHP" expanded="false" />
<element signature="e#36920#37340#0#PHP" expanded="false" />
<element signature="e#37345#37828#0#PHP" expanded="false" />
<element signature="e#37834#38640#0#PHP" expanded="false" />
<element signature="e#38645#41799#0#PHP" expanded="false" />
<element signature="e#41814#43142#0#PHP" expanded="false" />
<element signature="e#43158#44185#0#PHP" expanded="false" />
<element signature="e#44192#44950#0#PHP" expanded="false" />
<element signature="e#44955#47342#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -77,7 +78,7 @@
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<state relative-caret-position="179">
<caret line="247" column="31" lean-forward="false" selection-start-line="247" selection-start-column="31" selection-end-line="247" selection-end-column="31" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
... ... @@ -88,6 +89,7 @@
<element signature="e#5326#5744#0#PHP" expanded="false" />
<element signature="e#5749#9603#0#PHP" expanded="false" />
<element signature="e#9609#10029#0#PHP" expanded="false" />
<element signature="e#10034#13893#0#PHP" expanded="false" />
<element signature="e#13920#17622#0#PHP" expanded="false" />
<element signature="e#17652#20596#0#PHP" expanded="false" />
<element signature="e#20625#21455#0#PHP" expanded="false" />
... ... @@ -172,8 +174,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="183" />
<option name="y" value="61" />
<option name="x" value="245" />
<option name="y" value="68" />
<option name="width" value="1806" />
<option name="height" value="981" />
</component>
... ... @@ -272,7 +274,7 @@
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="15863000" />
<workItem from="1574469667436" duration="2189000" />
<workItem from="1574469667436" duration="3209000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -285,7 +287,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="179999000" />
<option name="totallyTimeSpent" value="181019000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -297,7 +299,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="183" y="61" width="1806" height="981" extended-state="0" />
<frame x="245" y="68" 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" />
... ... @@ -680,7 +682,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<state relative-caret-position="179">
<caret line="247" column="31" lean-forward="false" selection-start-line="247" selection-start-column="31" selection-end-line="247" selection-end-column="31" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
... ... @@ -691,6 +693,7 @@
<element signature="e#5326#5744#0#PHP" expanded="false" />
<element signature="e#5749#9603#0#PHP" expanded="false" />
<element signature="e#9609#10029#0#PHP" expanded="false" />
<element signature="e#10034#13893#0#PHP" expanded="false" />
<element signature="e#13920#17622#0#PHP" expanded="false" />
<element signature="e#17652#20596#0#PHP" expanded="false" />
<element signature="e#20625#21455#0#PHP" expanded="false" />
... ... @@ -702,8 +705,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="491">
<caret line="1009" column="55" lean-forward="false" selection-start-line="1009" selection-start-column="55" selection-end-line="1009" selection-end-column="55" />
<state relative-caret-position="294">
<caret line="1061" column="9" lean-forward="true" selection-start-line="1061" selection-start-column="9" selection-end-line="1061" selection-end-column="9" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -745,16 +748,15 @@
<element signature="e#30043#30577#0#PHP" expanded="false" />
<element signature="e#30582#31496#0#PHP" expanded="false" />
<element signature="e#31502#32156#0#PHP" expanded="false" />
<element signature="e#33756#34516#0#PHP" expanded="false" />
<element signature="e#35622#36453#0#PHP" expanded="false" />
<element signature="e#36459#36879#0#PHP" expanded="false" />
<element signature="e#36884#37367#0#PHP" expanded="false" />
<element signature="e#37373#38179#0#PHP" expanded="false" />
<element signature="e#38184#41338#0#PHP" expanded="false" />
<element signature="e#41353#42681#0#PHP" expanded="false" />
<element signature="e#42697#43724#0#PHP" expanded="false" />
<element signature="e#43731#44489#0#PHP" expanded="false" />
<element signature="e#44494#46881#0#PHP" expanded="false" />
<element signature="e#36083#36914#0#PHP" expanded="false" />
<element signature="e#36920#37340#0#PHP" expanded="false" />
<element signature="e#37345#37828#0#PHP" expanded="false" />
<element signature="e#37834#38640#0#PHP" expanded="false" />
<element signature="e#38645#41799#0#PHP" expanded="false" />
<element signature="e#41814#43142#0#PHP" expanded="false" />
<element signature="e#43158#44185#0#PHP" expanded="false" />
<element signature="e#44192#44950#0#PHP" expanded="false" />
<element signature="e#44955#47342#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1007,7 +1007,7 @@ class User extends Api
$where['status'] = ['eq',2];
$res = Db::name('order')->where($where)->find();
if(!empty($res)){
$this->error(['code'=>2,'msg'=>'您已经购买过了']);
$this->error(['code'=>2,'msg'=>'该属性视频您已经购买过了']);
}
$param['createtime'] = time();
$param['num'] = date('Ymd').substr(implode(NULL, array_map('ord', str_split(substr(uniqid(), 7, 13), 1))), 0, 8);
... ... @@ -1049,7 +1049,18 @@ class User extends Api
$video_attr = explode(',',$this->request->post('video_attr'));
$key = ['id','attr'];
$param['video_id'] = serialize($this->array_merge_more($key,$video_id,$video_attr));
$a = $this->array_merge_more($key,$video_id,$video_attr);
foreach ($a as &$v){
$param['video_id'] = serialize($v);
$where['user_id'] = ['eq',$param['user_id']];
$where['video_id'] = ['eq',$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']]);
}
}
$param['video_id'] = serialize($a);
$param['pic_id'] = $this->request->post('pic_id');
... ...
... ... @@ -5529,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-23 09:17:36 </div>
Generated on 2019-11-23 09:34:33 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...