郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 8a42d3c58427aa8b2212a941a44bce0d3bff71e0 1 个父辈 62a3f109
1 个管道 的构建 通过 耗费 1 秒

修改只能添加一次购物车

内嵌 并排对比
正在显示 3 个修改的文件 包含 65 行增加 和 51 行删除
... ... @@ -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="296">
<caret line="1086" column="35" lean-forward="true" selection-start-line="1086" selection-start-column="35" selection-end-line="1086" selection-end-column="35" />
<state relative-caret-position="387">
<caret line="882" column="13" lean-forward="true" selection-start-line="882" selection-start-column="13" selection-end-line="882" selection-end-column="13" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -54,25 +54,25 @@
<element signature="e#23459#24602#0#PHP" expanded="false" />
<element signature="e#24607#27272#0#PHP" expanded="false" />
<element signature="e#27278#27776#0#PHP" expanded="false" />
<element signature="e#27781#29146#0#PHP" expanded="false" />
<element signature="e#29152#29565#0#PHP" expanded="false" />
<element signature="e#29570#30049#0#PHP" expanded="false" />
<element signature="e#30055#30589#0#PHP" expanded="false" />
<element signature="e#30594#31979#0#PHP" expanded="false" />
<element signature="e#31985#32639#0#PHP" expanded="false" />
<element signature="e#32644#34597#0#PHP" expanded="false" />
<element signature="e#32798#32884#0#PHP" expanded="false" />
<element signature="e#32973#33061#0#PHP" expanded="false" />
<element signature="e#34603#35363#0#PHP" expanded="false" />
<element signature="e#38103#38934#0#PHP" expanded="false" />
<element signature="e#38940#39360#0#PHP" expanded="false" />
<element signature="e#39365#39848#0#PHP" expanded="false" />
<element signature="e#39854#40660#0#PHP" expanded="false" />
<element signature="e#40665#43819#0#PHP" expanded="false" />
<element signature="e#43834#45162#0#PHP" expanded="false" />
<element signature="e#45178#46205#0#PHP" expanded="false" />
<element signature="e#46212#46970#0#PHP" expanded="false" />
<element signature="e#46975#49362#0#PHP" expanded="false" />
<element signature="e#29733#30146#0#PHP" expanded="false" />
<element signature="e#30151#30630#0#PHP" expanded="false" />
<element signature="e#30636#31170#0#PHP" expanded="false" />
<element signature="e#31175#32560#0#PHP" expanded="false" />
<element signature="e#32566#33220#0#PHP" expanded="false" />
<element signature="e#33225#35178#0#PHP" expanded="false" />
<element signature="e#33379#33465#0#PHP" expanded="false" />
<element signature="e#33554#33642#0#PHP" expanded="false" />
<element signature="e#35184#35944#0#PHP" expanded="false" />
<element signature="e#35949#38658#0#PHP" expanded="false" />
<element signature="e#38684#39515#0#PHP" expanded="false" />
<element signature="e#39521#39941#0#PHP" expanded="false" />
<element signature="e#39946#40429#0#PHP" expanded="false" />
<element signature="e#40435#41241#0#PHP" expanded="false" />
<element signature="e#41246#44400#0#PHP" expanded="false" />
<element signature="e#44415#45743#0#PHP" expanded="false" />
<element signature="e#45759#46786#0#PHP" expanded="false" />
<element signature="e#46792#47550#0#PHP" expanded="false" />
<element signature="e#47555#49942#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="160" />
<option name="y" value="66" />
<option name="x" value="542" />
<option name="y" value="20" />
<option name="width" value="1806" />
<option name="height" value="974" />
</component>
... ... @@ -277,7 +277,7 @@
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="15863000" />
<workItem from="1574469667436" duration="23898000" />
<workItem from="1574469667436" duration="24271000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -290,7 +290,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="201708000" />
<option name="totallyTimeSpent" value="202081000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -302,8 +302,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="160" y="66" width="1806" height="974" extended-state="0" />
<editor active="true" />
<frame x="542" y="20" width="1806" height="974" 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.13739546" 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.13739546" 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="296">
<caret line="1086" column="35" lean-forward="true" selection-start-line="1086" selection-start-column="35" selection-end-line="1086" selection-end-column="35" />
<state relative-caret-position="387">
<caret line="882" column="13" lean-forward="true" selection-start-line="882" selection-start-column="13" selection-end-line="882" selection-end-column="13" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -746,25 +745,25 @@
<element signature="e#23459#24602#0#PHP" expanded="false" />
<element signature="e#24607#27272#0#PHP" expanded="false" />
<element signature="e#27278#27776#0#PHP" expanded="false" />
<element signature="e#27781#29146#0#PHP" expanded="false" />
<element signature="e#29152#29565#0#PHP" expanded="false" />
<element signature="e#29570#30049#0#PHP" expanded="false" />
<element signature="e#30055#30589#0#PHP" expanded="false" />
<element signature="e#30594#31979#0#PHP" expanded="false" />
<element signature="e#31985#32639#0#PHP" expanded="false" />
<element signature="e#32644#34597#0#PHP" expanded="false" />
<element signature="e#32798#32884#0#PHP" expanded="false" />
<element signature="e#32973#33061#0#PHP" expanded="false" />
<element signature="e#34603#35363#0#PHP" expanded="false" />
<element signature="e#38103#38934#0#PHP" expanded="false" />
<element signature="e#38940#39360#0#PHP" expanded="false" />
<element signature="e#39365#39848#0#PHP" expanded="false" />
<element signature="e#39854#40660#0#PHP" expanded="false" />
<element signature="e#40665#43819#0#PHP" expanded="false" />
<element signature="e#43834#45162#0#PHP" expanded="false" />
<element signature="e#45178#46205#0#PHP" expanded="false" />
<element signature="e#46212#46970#0#PHP" expanded="false" />
<element signature="e#46975#49362#0#PHP" expanded="false" />
<element signature="e#29733#30146#0#PHP" expanded="false" />
<element signature="e#30151#30630#0#PHP" expanded="false" />
<element signature="e#30636#31170#0#PHP" expanded="false" />
<element signature="e#31175#32560#0#PHP" expanded="false" />
<element signature="e#32566#33220#0#PHP" expanded="false" />
<element signature="e#33225#35178#0#PHP" expanded="false" />
<element signature="e#33379#33465#0#PHP" expanded="false" />
<element signature="e#33554#33642#0#PHP" expanded="false" />
<element signature="e#35184#35944#0#PHP" expanded="false" />
<element signature="e#35949#38658#0#PHP" expanded="false" />
<element signature="e#38684#39515#0#PHP" expanded="false" />
<element signature="e#39521#39941#0#PHP" expanded="false" />
<element signature="e#39946#40429#0#PHP" expanded="false" />
<element signature="e#40435#41241#0#PHP" expanded="false" />
<element signature="e#41246#44400#0#PHP" expanded="false" />
<element signature="e#44415#45743#0#PHP" expanded="false" />
<element signature="e#45759#46786#0#PHP" expanded="false" />
<element signature="e#46792#47550#0#PHP" expanded="false" />
<element signature="e#47555#49942#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -853,6 +853,14 @@ class User extends Api
if(empty($video_id)){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('car')
->field('id')
->where('user_id',$user_id)
->where('video_id',$video_id)
->find();
if(!empty($data)){
$this->error(['code'=>2,'msg'=>'您已经添加过了']);
}
$param['video_id'] = $video_id;
$param['createtime'] = time();
$param['user_id'] = $user_id;
... ... @@ -865,6 +873,14 @@ class User extends Api
}
}elseif (empty($video_id)){
$param['pic_id'] = $this->request->param('pic_id');
$data = Db::name('car')
->field('id')
->where('user_id',$user_id)
->where('video_id',$param['pic_id'])
->find();
if(!empty($data)){
$this->error(['code'=>2,'msg'=>'您已经添加过了']);
}
$param['createtime'] = time();
$param['user_id'] = $user_id;
$data = Db::name('car')
... ... @@ -1361,7 +1377,6 @@ class User extends Api
return $res;
}
/**
* @ApiTitle (消费记录)
* @ApiSummary (消费记录)
... ...
... ... @@ -5529,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-23 17:52:49 </div>
Generated on 2019-11-23 17:59:08 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...