From 72fa1e2f9f8f3db632c4e44ba3ce855df37159a7 Mon Sep 17 00:00:00 2001
From: guosheng <gs@bronet.cn>
Date: Fri, 22 Nov 2019 10:04:54 +0800
Subject: [PATCH] 总价格
---
.idea/workspace.xml | 89 +++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
application/api/controller/User.php | 7 ++++---
public/api.html | 2 +-
3 files changed, 48 insertions(+), 50 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2bc1980..d5ba920 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,8 @@
<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/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
+ <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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@@ -13,11 +14,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="User.php" pinned="false" current-in-tab="false">
+ <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="308">
- <caret line="1015" column="28" lean-forward="false" selection-start-line="1015" selection-start-column="28" selection-end-line="1015" selection-end-column="28" />
+ <state relative-caret-position="-66">
+ <caret line="1169" column="56" lean-forward="false" selection-start-line="1169" selection-start-column="56" selection-end-line="1169" selection-end-column="56" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
@@ -65,19 +66,17 @@
<element signature="e#33233#34106#0#PHP" expanded="false" />
<element signature="e#34112#34532#0#PHP" expanded="false" />
<element signature="e#34537#35020#0#PHP" expanded="false" />
- <element signature="e#35026#35806#0#PHP" expanded="false" />
- <element signature="e#35811#40716#0#PHP" expanded="false" />
- <element signature="e#40722#41480#0#PHP" expanded="false" />
- <element signature="e#41485#43749#0#PHP" expanded="false" />
+ <element signature="e#40766#41524#0#PHP" expanded="false" />
+ <element signature="e#41529#43793#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
+ <file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="184">
+ <state relative-caret-position="59">
<caret line="247" column="31" lean-forward="false" selection-start-line="247" selection-start-column="31" selection-end-line="247" selection-end-column="31" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
@@ -153,8 +152,8 @@
<option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
<option value="$PROJECT_DIR$/application/extra/verify.php" />
- <option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
+ <option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
@@ -172,9 +171,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
- <component name="ProjectFrameBounds" extendedState="1">
- <option name="x" value="160" />
- <option name="y" value="37" />
+ <component name="ProjectFrameBounds">
+ <option name="x" value="389" />
+ <option name="y" value="23" />
<option name="width" value="1699" />
<option name="height" value="970" />
</component>
@@ -271,7 +270,7 @@
<workItem from="1574252363848" duration="8841000" />
<workItem from="1574295812843" duration="20536000" />
<workItem from="1574336957891" duration="1350000" />
- <workItem from="1574382087071" duration="4201000" />
+ <workItem from="1574382087071" duration="5604000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
@@ -284,7 +283,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="144141000" />
+ <option name="totallyTimeSpent" value="145544000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -296,7 +295,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="160" y="37" width="1699" height="970" extended-state="1" />
+ <frame x="389" y="23" width="1699" height="970" 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.1561928" 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" />
@@ -677,10 +676,33 @@
</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="59">
+ <caret line="247" column="31" lean-forward="false" selection-start-line="247" selection-start-column="31" selection-end-line="247" selection-end-column="31" />
+ <folding>
+ <element signature="e#450#569#0#PHP" expanded="false" />
+ <element signature="e#575#888#0#PHP" expanded="false" />
+ <element signature="e#893#2938#0#PHP" expanded="false" />
+ <element signature="e#2944#3264#0#PHP" expanded="false" />
+ <element signature="e#3269#5320#0#PHP" expanded="false" />
+ <element signature="e#5326#5744#0#PHP" expanded="false" />
+ <element signature="e#5749#9603#0#PHP" expanded="false" />
+ <element signature="e#9609#10029#0#PHP" expanded="false" />
+ <element signature="e#10034#13893#0#PHP" expanded="false" />
+ <element signature="e#13920#17622#0#PHP" expanded="false" />
+ <element signature="e#17652#20596#0#PHP" expanded="false" />
+ <element signature="e#20625#21455#0#PHP" expanded="false" />
+ <element signature="e#21484#22317#0#PHP" expanded="false" />
+ <element signature="e#22340#22557#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="308">
- <caret line="1015" column="28" lean-forward="false" selection-start-line="1015" selection-start-column="28" selection-end-line="1015" selection-end-column="28" />
+ <state relative-caret-position="-66">
+ <caret line="1169" column="56" lean-forward="false" selection-start-line="1169" selection-start-column="56" selection-end-line="1169" selection-end-column="56" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
@@ -728,33 +750,8 @@
<element signature="e#33233#34106#0#PHP" expanded="false" />
<element signature="e#34112#34532#0#PHP" expanded="false" />
<element signature="e#34537#35020#0#PHP" expanded="false" />
- <element signature="e#35026#35806#0#PHP" expanded="false" />
- <element signature="e#35811#40716#0#PHP" expanded="false" />
- <element signature="e#40722#41480#0#PHP" expanded="false" />
- <element signature="e#41485#43749#0#PHP" expanded="false" />
- </folding>
- </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="184">
- <caret line="247" column="31" lean-forward="false" selection-start-line="247" selection-start-column="31" selection-end-line="247" selection-end-column="31" />
- <folding>
- <element signature="e#450#569#0#PHP" expanded="false" />
- <element signature="e#575#888#0#PHP" expanded="false" />
- <element signature="e#893#2938#0#PHP" expanded="false" />
- <element signature="e#2944#3264#0#PHP" expanded="false" />
- <element signature="e#3269#5320#0#PHP" expanded="false" />
- <element signature="e#5326#5744#0#PHP" expanded="false" />
- <element signature="e#5749#9603#0#PHP" expanded="false" />
- <element signature="e#9609#10029#0#PHP" expanded="false" />
- <element signature="e#10034#13893#0#PHP" expanded="false" />
- <element signature="e#13920#17622#0#PHP" expanded="false" />
- <element signature="e#17652#20596#0#PHP" expanded="false" />
- <element signature="e#20625#21455#0#PHP" expanded="false" />
- <element signature="e#21484#22317#0#PHP" expanded="false" />
- <element signature="e#22340#22557#0#PHP" expanded="false" />
+ <element signature="e#40766#41524#0#PHP" expanded="false" />
+ <element signature="e#41529#43793#0#PHP" expanded="false" />
</folding>
</state>
</provider>
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 3a1cd49..4a0e95c 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -1091,6 +1091,7 @@ class User extends Api
"pic_id": //图片,
"video_id": //视频,
"status" : //状态(1待支付 2已完成)
+ "total"://总价格
}
})
*/
@@ -1106,7 +1107,7 @@ class User extends Api
if(empty($type)){
$res = Db::name('order')
->where('user_id',$user_id)
- ->field('id,pic_id,video_id,status')
+ ->field('id,pic_id,video_id,status,total')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
@@ -1136,7 +1137,7 @@ class User extends Api
$res = Db::name('order')
->where('user_id',$user_id)
->where('status',1)
- ->field('id,pic_id,video_id,status')
+ ->field('id,pic_id,video_id,status,total')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
@@ -1166,7 +1167,7 @@ class User extends Api
$res = Db::name('order')
->where('user_id',$user_id)
->where('status',2)
- ->field('id,pic_id,video_id,status')
+ ->field('id,pic_id,video_id,status,total')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
diff --git a/public/api.html b/public/api.html
index b449bee..dd4d98e 100644
--- a/public/api.html
+++ b/public/api.html
@@ -5230,7 +5230,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
- Generated on 2019-11-22 09:40:13 </div>
+ Generated on 2019-11-22 10:04:45 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
--
libgit2 0.24.0