郭盛 / areial · 提交

转到一个项目

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

修改统计金额

内嵌 并排对比
正在显示 2 个修改的文件 包含 63 行增加 和 115 行删除
... ... @@ -2,7 +2,7 @@
<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/admin/controller/Order.php" afterPath="$PROJECT_DIR$/application/admin/controller/Order.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -13,93 +13,28 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<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="111">
<caret line="1826" column="21" lean-forward="false" selection-start-line="1826" selection-start-column="21" selection-end-line="1826" selection-end-column="21" />
<state relative-caret-position="368">
<caret line="713" column="53" lean-forward="true" selection-start-line="713" selection-start-column="53" selection-end-line="713" selection-end-column="53" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#1266#2890#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" />
<element signature="e#4989#5332#0#PHP" expanded="false" />
<element signature="e#5338#5751#0#PHP" expanded="false" />
<element signature="e#5756#6104#0#PHP" expanded="false" />
<element signature="e#6110#6947#0#PHP" expanded="false" />
<element signature="e#6952#9147#0#PHP" expanded="false" />
<element signature="e#9153#9833#0#PHP" expanded="false" />
<element signature="e#9838#10691#0#PHP" expanded="false" />
<element signature="e#10697#11486#0#PHP" expanded="false" />
<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#16622#0#PHP" expanded="false" />
<element signature="e#16627#19053#0#PHP" expanded="false" />
<element signature="e#19059#19961#0#PHP" expanded="false" />
<element signature="e#19966#22792#0#PHP" expanded="false" />
<element signature="e#22798#23175#0#PHP" expanded="false" />
<element signature="e#23180#23501#0#PHP" expanded="false" />
<element signature="e#23507#24012#0#PHP" expanded="false" />
<element signature="e#24017#24268#0#PHP" expanded="false" />
<element signature="e#24274#24753#0#PHP" expanded="false" />
<element signature="e#24758#25515#0#PHP" expanded="false" />
<element signature="e#25521#26002#0#PHP" expanded="false" />
<element signature="e#26007#26777#0#PHP" expanded="false" />
<element signature="e#26783#27146#0#PHP" expanded="false" />
<element signature="e#27151#27342#0#PHP" expanded="false" />
<element signature="e#27348#27706#0#PHP" expanded="false" />
<element signature="e#27711#27902#0#PHP" expanded="false" />
<element signature="e#27908#29051#0#PHP" expanded="false" />
<element signature="e#29056#31721#0#PHP" expanded="false" />
<element signature="e#31727#32225#0#PHP" expanded="false" />
<element signature="e#32230#33976#0#PHP" expanded="false" />
<element signature="e#33982#34395#0#PHP" expanded="false" />
<element signature="e#34400#34879#0#PHP" expanded="false" />
<element signature="e#34885#35419#0#PHP" expanded="false" />
<element signature="e#35424#36809#0#PHP" expanded="false" />
<element signature="e#36815#37469#0#PHP" expanded="false" />
<element signature="e#37474#39489#0#PHP" expanded="false" />
<element signature="e#39495#40255#0#PHP" expanded="false" />
<element signature="e#40260#42969#0#PHP" expanded="false" />
<element signature="e#42995#43826#0#PHP" expanded="false" />
<element signature="e#43832#44252#0#PHP" expanded="false" />
<element signature="e#44257#44740#0#PHP" expanded="false" />
<element signature="e#44746#45552#0#PHP" expanded="false" />
<element signature="e#45557#48711#0#PHP" expanded="false" />
<element signature="e#48726#50054#0#PHP" expanded="false" />
<element signature="e#50070#51097#0#PHP" expanded="false" />
<element signature="e#51103#51861#0#PHP" expanded="false" />
<element signature="e#51866#55609#0#PHP" expanded="false" />
<element signature="e#55615#56007#0#PHP" expanded="false" />
<element signature="e#56012#56964#0#PHP" expanded="false" />
<element signature="e#56988#57561#0#PHP" expanded="false" />
<element signature="e#57567#58166#0#PHP" expanded="false" />
<element signature="e#58171#59098#0#PHP" expanded="false" />
<element signature="e#59104#59818#0#PHP" expanded="false" />
<element signature="e#59824#60251#0#PHP" expanded="false" />
<element signature="e#60256#60725#0#PHP" expanded="false" />
<element signature="e#60732#61937#0#PHP" expanded="false" />
<element signature="e#62089#62428#1#PHP" expanded="false" />
<element signature="e#62458#62812#1#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Order.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
<folding>
<element signature="e#40#74#0#PHP" expanded="true" />
<element signature="e#955#3141#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#5935#16029#0#PHP" expanded="false" />
<element signature="e#16035#16455#0#PHP" expanded="false" />
<element signature="e#16460#26484#0#PHP" expanded="false" />
<element signature="e#26501#26798#0#PHP" expanded="false" />
<element signature="e#26803#27196#0#PHP" expanded="false" />
<element signature="e#27223#30701#0#PHP" expanded="false" />
<element signature="e#30730#33635#0#PHP" expanded="false" />
<element signature="e#37558#37945#0#PHP" expanded="false" />
<element signature="e#38006#38962#0#PHP" expanded="false" />
<element signature="e#39623#46795#0#PHP" expanded="false" />
<element signature="e#46818#47035#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -172,7 +107,6 @@
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<option value="$PROJECT_DIR$/runtime/log/201912/07.log" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/admin/view/accredit/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/accredit/edit.html" />
... ... @@ -183,6 +117,7 @@
<option value="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
</list>
</option>
</component>
... ... @@ -200,9 +135,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="695" />
<option name="y" value="231" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="369" />
<option name="y" value="89" />
<option name="width" value="1624" />
<option name="height" value="918" />
</component>
... ... @@ -238,13 +173,13 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
... ... @@ -339,7 +274,7 @@
<workItem from="1575773423431" duration="694000" />
<workItem from="1575776183372" duration="2267000" />
<workItem from="1575790089275" duration="377000" />
<workItem from="1575851041026" duration="12832000" />
<workItem from="1575851041026" duration="13593000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -352,7 +287,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="353299000" />
<option name="totallyTimeSpent" value="354060000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -364,10 +299,10 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="695" y="231" width="1624" height="918" extended-state="0" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" />
<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.1528133" 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.12739871" 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" />
... ... @@ -639,13 +574,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="25">
<caret line="786" column="40" lean-forward="true" selection-start-line="786" selection-start-column="40" selection-end-line="786" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/dashboard/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
... ... @@ -781,6 +709,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="24" column="50" lean-forward="true" selection-start-line="24" selection-start-column="50" selection-end-line="24" selection-end-column="50" />
<folding>
<element signature="e#40#74#0#PHP" expanded="true" />
<element signature="e#955#3141#0#PHP" expanded="false" />
</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="111">
... ... @@ -858,13 +797,27 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
<state relative-caret-position="368">
<caret line="713" column="53" lean-forward="true" selection-start-line="713" selection-start-column="53" selection-end-line="713" selection-end-column="53" />
<folding>
<element signature="e#40#74#0#PHP" expanded="true" />
<element signature="e#955#3141#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#5935#16029#0#PHP" expanded="false" />
<element signature="e#16035#16455#0#PHP" expanded="false" />
<element signature="e#16460#26484#0#PHP" expanded="false" />
<element signature="e#26501#26798#0#PHP" expanded="false" />
<element signature="e#26803#27196#0#PHP" expanded="false" />
<element signature="e#27223#30701#0#PHP" expanded="false" />
<element signature="e#30730#33635#0#PHP" expanded="false" />
<element signature="e#37558#37945#0#PHP" expanded="false" />
<element signature="e#38006#38962#0#PHP" expanded="false" />
<element signature="e#39623#46795#0#PHP" expanded="false" />
<element signature="e#46818#47035#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -708,23 +708,18 @@ class Pay extends Api
if(!empty($pic_id)){
//将购买次数加1
foreach ($pic_id as $key => $v){
$pic = Db::name('pic')->field('id,title,url,code,price,buy_num,money')->where('id',$v)->find();
$str .= "图片标题:$pic[title],云盘地址:$pic[url],提取码:$pic[code],";
//非会员
if($user['is_vip'] == 0){
$pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
$total_money = $pic['money']+$pic['price'];
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$total_money]);
}else{
//是会员
$pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
$total_money = $pic['money'] + ($pic['price']*0.75);
Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$total_money]);
}
}
//拼接发送短信的内容
foreach ($pic_id as $key => $v){
$pic = Db::name('pic')->field('id,title,url,code')->where('id',$v)->find();
$str .= "图片标题:$pic[title],云盘地址:$pic[url],提取码:$pic[code],";
}
}
//视频
if(!empty($video_id)){
... ...