郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 4889d8375c035e8aebfd9197e97e7cc17c01a115 1 个父辈 0b4060e3
1 个管道 的构建 通过 耗费 1 秒

修改图片购买总金额

内嵌 并排对比
正在显示 4 个修改的文件 包含 151 行增加 和 79 行删除
... ... @@ -2,8 +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$/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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/pic.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -14,12 +15,13 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295">
<caret line="327" column="0" lean-forward="true" selection-start-line="327" selection-start-column="0" selection-end-line="327" selection-end-column="0" />
<state relative-caret-position="196">
<caret line="588" column="8" lean-forward="true" selection-start-line="588" selection-start-column="8" selection-end-line="591" selection-end-column="21" />
<folding>
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4571#0#PHP" expanded="false" />
<element signature="e#4577#4984#0#PHP" expanded="false" />
... ... @@ -34,6 +36,13 @@
<element signature="e#11491#12839#0#PHP" expanded="false" />
<element signature="e#12845#13547#0#PHP" expanded="false" />
<element signature="e#13552#14752#0#PHP" expanded="false" />
<element signature="e#14758#15334#0#PHP" expanded="false" />
<element signature="e#15339#15900#0#PHP" expanded="false" />
<element signature="e#15906#16590#0#PHP" expanded="false" />
<element signature="e#16595#18691#0#PHP" expanded="false" />
<element signature="e#18697#19567#0#PHP" expanded="false" />
<element signature="e#22074#22451#0#PHP" expanded="false" />
<element signature="e#22456#22777#0#PHP" expanded="false" />
<element signature="e#22783#23288#0#PHP" expanded="false" />
<element signature="e#23293#23544#0#PHP" expanded="false" />
<element signature="e#23550#24029#0#PHP" expanded="false" />
... ... @@ -78,6 +87,34 @@
</provider>
</entry>
</file>
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96">
<caret line="370" column="37" lean-forward="false" selection-start-line="370" selection-start-column="37" selection-end-line="370" selection-end-column="37" />
<folding>
<element signature="e#574#693#0#PHP" expanded="false" />
<element signature="e#699#1012#0#PHP" expanded="false" />
<element signature="e#1017#3093#0#PHP" expanded="false" />
<element signature="e#3099#3419#0#PHP" expanded="false" />
<element signature="e#3424#5506#0#PHP" expanded="false" />
<element signature="e#5512#5930#0#PHP" expanded="false" />
<element signature="e#6179#6269#0#PHP" expanded="false" />
<element signature="e#6347#6443#0#PHP" expanded="false" />
<element signature="e#12255#14030#0#PHP" expanded="false" />
<element signature="e#14103#14523#0#PHP" expanded="false" />
<element signature="e#22637#22934#0#PHP" expanded="false" />
<element signature="e#22939#23332#0#PHP" expanded="false" />
<element signature="e#23359#26837#0#PHP" expanded="false" />
<element signature="e#26866#29771#0#PHP" expanded="false" />
<element signature="e#29800#33250#0#PHP" expanded="false" />
<element signature="e#33279#37016#0#PHP" expanded="false" />
<element signature="e#37039#37256#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
... ... @@ -123,7 +160,6 @@
<option value="$PROJECT_DIR$/application/admin/view/vip/edit.html" />
<option value="$USER_HOME$/Desktop/1.html" />
<option value="$PROJECT_DIR$/application/nsms/nsms.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/extra/verify.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
... ... @@ -139,14 +175,15 @@
<option value="$PROJECT_DIR$/application/admin/view/type/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/pictype/edit.html" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pictype.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<option value="$PROJECT_DIR$/application/admin/model/Pictype.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pictype.js" />
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
</list>
</option>
</component>
... ... @@ -164,9 +201,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="259" />
<option name="y" value="63" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="204" />
<option name="y" value="166" />
<option name="width" value="1700" />
<option name="height" value="1000" />
</component>
... ... @@ -296,7 +333,7 @@
<workItem from="1575541798312" duration="2359000" />
<workItem from="1575592025964" duration="640000" />
<workItem from="1575599624364" duration="95000" />
<workItem from="1575680867057" duration="5509000" />
<workItem from="1575680867057" duration="8140000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -309,7 +346,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="315408000" />
<option name="totallyTimeSpent" value="318039000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -321,17 +358,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="259" y="63" width="1700" height="1000" extended-state="0" />
<editor active="true" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<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.19512194" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1705757" 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" />
<window_info id="Event Log" 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="0" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" 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="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="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.10428737" 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.09793253" sideWeight="0.5" order="2" side_tool="false" 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="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="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" />
... ... @@ -379,13 +415,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/admin/model/Vip.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="568">
... ... @@ -583,30 +612,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="373">
<caret line="40" column="26" lean-forward="false" selection-start-line="40" selection-start-column="26" selection-end-line="40" selection-end-column="26" />
<folding>
<element signature="e#699#1012#0#PHP" expanded="false" />
<element signature="e#1017#3093#0#PHP" expanded="false" />
<element signature="e#3099#3419#0#PHP" expanded="false" />
<element signature="e#3424#5506#0#PHP" expanded="false" />
<element signature="e#5512#5930#0#PHP" expanded="false" />
<element signature="e#5935#13303#0#PHP" expanded="false" />
<element signature="e#13309#13729#0#PHP" expanded="false" />
<element signature="e#13734#21031#0#PHP" expanded="false" />
<element signature="e#21048#21345#0#PHP" expanded="false" />
<element signature="e#21350#21743#0#PHP" expanded="false" />
<element signature="e#21770#25248#0#PHP" expanded="false" />
<element signature="e#25277#28182#0#PHP" expanded="false" />
<element signature="e#28211#31661#0#PHP" expanded="false" />
<element signature="e#31690#35427#0#PHP" expanded="false" />
<element signature="e#35450#35667#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/type/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
... ... @@ -655,14 +660,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/model/relation/OneToOne.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
... ... @@ -703,14 +700,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="349">
<caret line="52" column="39" lean-forward="true" selection-start-line="52" selection-start-column="39" selection-end-line="52" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pictype.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
... ... @@ -743,6 +732,38 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="455">
<caret line="39" column="28" lean-forward="true" selection-start-line="39" selection-start-column="28" selection-end-line="39" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Token.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="19" column="27" lean-forward="false" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="799">
<caret line="40" column="73" lean-forward="false" selection-start-line="40" selection-start-column="73" selection-end-line="40" selection-end-column="73" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="338">
... ... @@ -761,19 +782,12 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="455">
<caret line="39" column="28" lean-forward="true" selection-start-line="39" selection-start-column="28" selection-end-line="39" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295">
<caret line="327" column="0" lean-forward="true" selection-start-line="327" selection-start-column="0" selection-end-line="327" selection-end-column="0" />
<state relative-caret-position="196">
<caret line="588" column="8" lean-forward="true" selection-start-line="588" selection-start-column="8" selection-end-line="591" selection-end-column="21" />
<folding>
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4571#0#PHP" expanded="false" />
<element signature="e#4577#4984#0#PHP" expanded="false" />
... ... @@ -788,6 +802,13 @@
<element signature="e#11491#12839#0#PHP" expanded="false" />
<element signature="e#12845#13547#0#PHP" expanded="false" />
<element signature="e#13552#14752#0#PHP" expanded="false" />
<element signature="e#14758#15334#0#PHP" expanded="false" />
<element signature="e#15339#15900#0#PHP" expanded="false" />
<element signature="e#15906#16590#0#PHP" expanded="false" />
<element signature="e#16595#18691#0#PHP" expanded="false" />
<element signature="e#18697#19567#0#PHP" expanded="false" />
<element signature="e#22074#22451#0#PHP" expanded="false" />
<element signature="e#22456#22777#0#PHP" expanded="false" />
<element signature="e#22783#23288#0#PHP" expanded="false" />
<element signature="e#23293#23544#0#PHP" expanded="false" />
<element signature="e#23550#24029#0#PHP" expanded="false" />
... ... @@ -831,5 +852,31 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96">
<caret line="370" column="37" lean-forward="false" selection-start-line="370" selection-start-column="37" selection-end-line="370" selection-end-column="37" />
<folding>
<element signature="e#574#693#0#PHP" expanded="false" />
<element signature="e#699#1012#0#PHP" expanded="false" />
<element signature="e#1017#3093#0#PHP" expanded="false" />
<element signature="e#3099#3419#0#PHP" expanded="false" />
<element signature="e#3424#5506#0#PHP" expanded="false" />
<element signature="e#5512#5930#0#PHP" expanded="false" />
<element signature="e#6179#6269#0#PHP" expanded="false" />
<element signature="e#6347#6443#0#PHP" expanded="false" />
<element signature="e#12255#14030#0#PHP" expanded="false" />
<element signature="e#14103#14523#0#PHP" expanded="false" />
<element signature="e#22637#22934#0#PHP" expanded="false" />
<element signature="e#22939#23332#0#PHP" expanded="false" />
<element signature="e#23359#26837#0#PHP" expanded="false" />
<element signature="e#26866#29771#0#PHP" expanded="false" />
<element signature="e#29800#33250#0#PHP" expanded="false" />
<element signature="e#33279#37016#0#PHP" expanded="false" />
<element signature="e#37039#37256#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -17,6 +17,7 @@ return [
'Price' =>'正常价格',
'Vip_price' =>'会员价格',
'Buy_num' =>'购买数量',
'Money' =>'总金额',
'Click_num' =>'点击数量',
'Createtime' => '创建时间',
'Updatetime' => '修改时间'
... ...
... ... @@ -188,15 +188,26 @@ class Pay extends Api
$this->error(['code'=>2,'msg'=>'余额不足,请充值后重试']);
}
$money = $res['money'] - $data['total'];
$uid = $this->uid;
$login = Db::name('user')
->where('id',$uid)
->field('id,is_vip')
->find();
// 启动事务
Db::startTrans();
try{
if(!empty($pic_id)){
//将购买次数加1
foreach ($pic_id as $key => $v){
$pic = Db::name('pic')->field('id,buy_num')->where('id',$v)->find();
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1]);
//非会员
if($login['is_vip'] == 0){
$pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$pic['money']+$pic['price']]);
}else{
//是会员
$pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$pic['money']+$pic['price']]);
}
}
//拼接发送短信的内容
foreach ($pic_id as $key => $v){
... ... @@ -338,14 +349,26 @@ class Pay extends Api
$this->error(['code'=>2,'msg'=>'余额不足,请充值后重试']);
}
$money = $res['money'] - $data['total'];
$uid = $this->uid;
$login = Db::name('user')
->where('id',$uid)
->field('id,is_vip')
->find();
// 启动事务
Db::startTrans();
try{
if(!empty($pic_id)){
//修改购买次数
foreach ($pic_id as $key => $v){
$pic = Db::name('pic')->field('id,buy_num')->where('id',$v)->find();
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1]);
//非会员
if($login['is_vip'] == 0){
$pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$pic['money']+$pic['price']]);
}else{
//是会员
$pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$pic['money']+$pic['price']]);
}
}
//拼接发送短信内容
foreach ($pic_id as $key => $v){
... ...
... ... @@ -38,6 +38,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'code', title: __('Code'),operate:false},
{field: 'price', title: __('Price'),operate:false},
{field: 'buy_num', title: __('Buy_num'),operate:false},
{field: 'money', title: __('Money'),operate:false},
{field: 'click_num', title: __('Click_num'),operate:false},
{field: 'is_top', title: __('Is_top'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
... ...