郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 7bd59ceba17a3a87c39d82513eb66529c18097af 1 个父辈 5ba334ac
1 个管道 的构建 通过 耗费 1 秒

修改视频下订单

内嵌 并排对比
正在显示 3 个修改的文件 包含 34 行增加 和 36 行删除
... ... @@ -2,7 +2,6 @@
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -17,8 +16,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="175">
<caret line="1020" column="17" lean-forward="true" selection-start-line="1020" selection-start-column="17" selection-end-line="1020" selection-end-column="17" />
<state relative-caret-position="400">
<caret line="1020" column="47" lean-forward="true" selection-start-line="1020" selection-start-column="47" selection-end-line="1020" selection-end-column="47" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -62,17 +61,17 @@
<element signature="e#31502#32156#0#PHP" expanded="false" />
<element signature="e#32315#32401#0#PHP" expanded="false" />
<element signature="e#32490#32578#0#PHP" expanded="false" />
<element signature="e#34173#34933#0#PHP" expanded="false" />
<element signature="e#34938#36539#0#PHP" expanded="false" />
<element signature="e#36565#37396#0#PHP" expanded="false" />
<element signature="e#37402#37822#0#PHP" expanded="false" />
<element signature="e#37827#38310#0#PHP" expanded="false" />
<element signature="e#38316#39122#0#PHP" expanded="false" />
<element signature="e#39127#42281#0#PHP" expanded="false" />
<element signature="e#42296#43624#0#PHP" expanded="false" />
<element signature="e#43640#44667#0#PHP" expanded="false" />
<element signature="e#44674#45432#0#PHP" expanded="false" />
<element signature="e#45437#47824#0#PHP" expanded="false" />
<element signature="e#34126#34886#0#PHP" expanded="false" />
<element signature="e#34891#36492#0#PHP" expanded="false" />
<element signature="e#36518#37349#0#PHP" expanded="false" />
<element signature="e#37355#37775#0#PHP" expanded="false" />
<element signature="e#37780#38263#0#PHP" expanded="false" />
<element signature="e#38269#39075#0#PHP" expanded="false" />
<element signature="e#39080#42234#0#PHP" expanded="false" />
<element signature="e#42249#43577#0#PHP" expanded="false" />
<element signature="e#43593#44620#0#PHP" expanded="false" />
<element signature="e#44627#45385#0#PHP" expanded="false" />
<element signature="e#45390#47777#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -176,9 +175,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="58" />
<option name="y" value="95" />
<component name="ProjectFrameBounds">
<option name="x" value="320" />
<option name="y" value="39" />
<option name="width" value="1806" />
<option name="height" value="981" />
</component>
... ... @@ -277,7 +276,7 @@
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="15863000" />
<workItem from="1574469667436" duration="10601000" />
<workItem from="1574469667436" duration="11427000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -290,7 +289,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="188411000" />
<option name="totallyTimeSpent" value="189237000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -302,7 +301,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="58" y="95" width="1806" height="981" extended-state="1" />
<frame x="320" y="39" 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" />
... ... @@ -708,8 +707,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="1020" column="17" lean-forward="true" selection-start-line="1020" selection-start-column="17" selection-end-line="1020" selection-end-column="17" />
<state relative-caret-position="400">
<caret line="1020" column="47" lean-forward="true" selection-start-line="1020" selection-start-column="47" selection-end-line="1020" selection-end-column="47" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -753,17 +752,17 @@
<element signature="e#31502#32156#0#PHP" expanded="false" />
<element signature="e#32315#32401#0#PHP" expanded="false" />
<element signature="e#32490#32578#0#PHP" expanded="false" />
<element signature="e#34173#34933#0#PHP" expanded="false" />
<element signature="e#34938#36539#0#PHP" expanded="false" />
<element signature="e#36565#37396#0#PHP" expanded="false" />
<element signature="e#37402#37822#0#PHP" expanded="false" />
<element signature="e#37827#38310#0#PHP" expanded="false" />
<element signature="e#38316#39122#0#PHP" expanded="false" />
<element signature="e#39127#42281#0#PHP" expanded="false" />
<element signature="e#42296#43624#0#PHP" expanded="false" />
<element signature="e#43640#44667#0#PHP" expanded="false" />
<element signature="e#44674#45432#0#PHP" expanded="false" />
<element signature="e#45437#47824#0#PHP" expanded="false" />
<element signature="e#34126#34886#0#PHP" expanded="false" />
<element signature="e#34891#36492#0#PHP" expanded="false" />
<element signature="e#36518#37349#0#PHP" expanded="false" />
<element signature="e#37355#37775#0#PHP" expanded="false" />
<element signature="e#37780#38263#0#PHP" expanded="false" />
<element signature="e#38269#39075#0#PHP" expanded="false" />
<element signature="e#39080#42234#0#PHP" expanded="false" />
<element signature="e#42249#43577#0#PHP" expanded="false" />
<element signature="e#43593#44620#0#PHP" expanded="false" />
<element signature="e#44627#45385#0#PHP" expanded="false" />
<element signature="e#45390#47777#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1014,12 +1014,11 @@ class User extends Api
foreach ($v['video_id'] as $v1){
if($v1['id'] == $video_id && $v1['attr'] == $video_attr){
$this->error(['code'=>2,'msg'=>'该属性的视频已经购买过了','video_id'=>$v1['id']]);
}else{
$param['video_id'] = serialize($a);
}
}
}
}
$param['video_id'] = serialize($a);
$param['createtime'] = time();
$param['num'] = date('Ymd').substr(implode(NULL, array_map('ord', str_split(substr(uniqid(), 7, 13), 1))), 0, 8);
$data = Db::name('order')
... ...
... ... @@ -5529,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-23 11:44:50 </div>
Generated on 2019-11-23 12:00:20 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...