郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 0d8716260cd4013514e936fddc4c97b9ab480eda 1 个父辈 c5b7954a
1 个管道 的构建 通过 耗费 2 秒

修改消费记录

内嵌 并排对比
正在显示 2 个修改的文件 包含 75 行增加 和 50 行删除
... ... @@ -16,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="310">
<caret line="1509" column="18" lean-forward="true" selection-start-line="1509" selection-start-column="18" selection-end-line="1509" selection-end-column="18" />
<state relative-caret-position="-1239">
<caret line="1486" column="20" lean-forward="true" selection-start-line="1486" selection-start-column="20" selection-end-line="1486" selection-end-column="20" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -70,18 +70,16 @@
<element signature="e#42078#42498#0#PHP" expanded="false" />
<element signature="e#42503#42986#0#PHP" expanded="false" />
<element signature="e#42992#43798#0#PHP" expanded="false" />
<element signature="e#43803#46957#0#PHP" expanded="false" />
<element signature="e#46972#48300#0#PHP" expanded="false" />
<element signature="e#48316#49343#0#PHP" expanded="false" />
<element signature="e#49349#50107#0#PHP" expanded="false" />
<element signature="e#52463#52855#0#PHP" expanded="false" />
<element signature="e#52860#53812#0#PHP" expanded="false" />
<element signature="e#53836#54409#0#PHP" expanded="false" />
<element signature="e#54415#55014#0#PHP" expanded="false" />
<element signature="e#55019#55961#0#PHP" expanded="false" />
<element signature="e#55967#56682#0#PHP" expanded="false" />
<element signature="e#56688#57115#0#PHP" expanded="false" />
<element signature="e#57120#57385#0#PHP" expanded="false" />
<element signature="e#53861#54253#0#PHP" expanded="false" />
<element signature="e#54258#55210#0#PHP" expanded="false" />
<element signature="e#55234#55807#0#PHP" expanded="false" />
<element signature="e#55813#56412#0#PHP" expanded="false" />
<element signature="e#56417#57359#0#PHP" expanded="false" />
<element signature="e#57365#58080#0#PHP" expanded="false" />
<element signature="e#58086#58513#0#PHP" expanded="false" />
<element signature="e#58518#58783#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -208,9 +206,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="643" />
<option name="y" value="22" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="153" />
<option name="y" value="62" />
<option name="width" value="1776" />
<option name="height" value="1042" />
</component>
... ... @@ -317,7 +315,7 @@
<workItem from="1574641631900" duration="15479000" />
<workItem from="1574669596135" duration="11747000" />
<workItem from="1574727687281" duration="17586000" />
<workItem from="1574759184313" duration="1785000" />
<workItem from="1574759184313" duration="3844000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -330,7 +328,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="249642000" />
<option name="totallyTimeSpent" value="251701000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -342,7 +340,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="643" y="22" width="1776" height="1042" extended-state="0" />
<frame x="153" y="62" width="1776" height="1042" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.14335664" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
... ... @@ -352,7 +350,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.1281768" 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="false" show_stripe_button="true" weight="0.1281768" 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" />
... ... @@ -395,7 +393,7 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="9" />
<option name="time" value="10" />
</breakpoint-manager>
<watches-manager />
</component>
... ... @@ -773,8 +771,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="310">
<caret line="1509" column="18" lean-forward="true" selection-start-line="1509" selection-start-column="18" selection-end-line="1509" selection-end-column="18" />
<state relative-caret-position="-1239">
<caret line="1486" column="20" lean-forward="true" selection-start-line="1486" selection-start-column="20" selection-end-line="1486" selection-end-column="20" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -827,18 +825,16 @@
<element signature="e#42078#42498#0#PHP" expanded="false" />
<element signature="e#42503#42986#0#PHP" expanded="false" />
<element signature="e#42992#43798#0#PHP" expanded="false" />
<element signature="e#43803#46957#0#PHP" expanded="false" />
<element signature="e#46972#48300#0#PHP" expanded="false" />
<element signature="e#48316#49343#0#PHP" expanded="false" />
<element signature="e#49349#50107#0#PHP" expanded="false" />
<element signature="e#52463#52855#0#PHP" expanded="false" />
<element signature="e#52860#53812#0#PHP" expanded="false" />
<element signature="e#53836#54409#0#PHP" expanded="false" />
<element signature="e#54415#55014#0#PHP" expanded="false" />
<element signature="e#55019#55961#0#PHP" expanded="false" />
<element signature="e#55967#56682#0#PHP" expanded="false" />
<element signature="e#56688#57115#0#PHP" expanded="false" />
<element signature="e#57120#57385#0#PHP" expanded="false" />
<element signature="e#53861#54253#0#PHP" expanded="false" />
<element signature="e#54258#55210#0#PHP" expanded="false" />
<element signature="e#55234#55807#0#PHP" expanded="false" />
<element signature="e#55813#56412#0#PHP" expanded="false" />
<element signature="e#56417#57359#0#PHP" expanded="false" />
<element signature="e#57365#58080#0#PHP" expanded="false" />
<element signature="e#58086#58513#0#PHP" expanded="false" />
<element signature="e#58518#58783#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1473,6 +1473,10 @@ class User extends Api
$pageNum = $this->request->param('pageNum',10,'intval');
$rule = config('verify.path');
$user_id = $this->uid;
$res = Db::name('user')
->where('id',$user_id)
->field('id,is_vip')
->find();
$data = Db::name('order')
->field('id,user_id,pic_id,video_id,total,createtime')
->where('user_id',$user_id)
... ... @@ -1480,26 +1484,51 @@ class User extends Api
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
$v['createtime'] = date('Y-m-d',$v['createtime']);
if(!empty($v['pic_id'])){
$v['pic_id'] = explode(',',$v['pic_id']);
foreach ($v['pic_id'] as &$v1){
$v1 = Db::name('pic')->field('id,title,thumbnail,url,code,price')->where('id',$v1)->find();
$v1['thumbnail'] = $rule.$v1['thumbnail'];
$v1['vipprice'] = $v1['price']*0.75;
//判断该用户是否为会员
if($res['is_vip'] == 1){
//是的情况
foreach ($data as &$v){
$v['createtime'] = date('Y-m-d',$v['createtime']);
if(!empty($v['pic_id'])){
$v['pic_id'] = explode(',',$v['pic_id']);
foreach ($v['pic_id'] as &$v1){
$v1 = Db::name('pic')->field('id,title,thumbnail,url,code,price')->where('id',$v1)->find();
$v1['thumbnail'] = $rule.$v1['thumbnail'];
$v1['vipprice'] = $v1['price']*0.75;
}
}
if(!empty($v['video_id'])){
$v['video_id'] = unserialize($v['video_id']);
foreach ($v['video_id'] as &$v2){
$v2['info'] = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2['id'])->find();
$v2['info']['attr'] = $v2['attr'];
unset($v2['attr']);
$v2['info']['thumbnail'] = $rule.$v2['info']['thumbnail'];
$v2['info']['vipprice'] = $v2['info']['price']*0.75;
$v2['info']['four_vipprice'] = $v2['info']['four_price'] * 0.75;
$v2['info']['eight_vipprice'] = $v2['info']['eight_price'] * 0.75;
}
}
}
if(!empty($v['video_id'])){
$v['video_id'] = unserialize($v['video_id']);
foreach ($v['video_id'] as &$v2){
$v2['info'] = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2['id'])->find();
$v2['info']['attr'] = $v2['attr'];
unset($v2['attr']);
$v2['info']['thumbnail'] = $rule.$v2['info']['thumbnail'];
$v2['info']['vipprice'] = $v2['info']['price']*0.75;
$v2['info']['four_vipprice'] = $v2['info']['four_price'] * 0.75;
$v2['info']['eight_vipprice'] = $v2['info']['eight_price'] * 0.75;
}else{
//否的情况
foreach ($data as &$v){
$v['createtime'] = date('Y-m-d',$v['createtime']);
if(!empty($v['pic_id'])){
$v['pic_id'] = explode(',',$v['pic_id']);
foreach ($v['pic_id'] as &$v1){
$v1 = Db::name('pic')->field('id,title,thumbnail,url,code,price')->where('id',$v1)->find();
$v1['thumbnail'] = $rule.$v1['thumbnail'];
}
}
if(!empty($v['video_id'])){
$v['video_id'] = unserialize($v['video_id']);
foreach ($v['video_id'] as &$v2){
$v2['info'] = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2['id'])->find();
$v2['info']['attr'] = $v2['attr'];
unset($v2['attr']);
$v2['info']['thumbnail'] = $rule.$v2['info']['thumbnail'];
}
}
}
}
... ...