郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 5c1552f14c86e9bab27f2d1bba59792208648659 1 个父辈 a4cf8401
1 个管道 的构建 通过 耗费 0 秒

修改发票状态

内嵌 并排对比
正在显示 3 个修改的文件 包含 31 行增加 和 47 行删除
... ... @@ -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/lang/zh-cn/order.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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/assets/js/backend/order.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/order.js" />
</list>
... ... @@ -15,21 +15,21 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="order.js" pinned="false" current-in-tab="true">
<file leaf-file-name="order.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="30" column="148" lean-forward="false" selection-start-line="30" selection-start-column="148" selection-end-line="30" selection-end-column="148" />
<state relative-caret-position="275">
<caret line="25" column="70" lean-forward="true" selection-start-line="25" selection-start-column="70" selection-end-line="25" selection-end-column="70" />
<folding />
</state>
</provider>
</entry>
</file>
<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="408">
<caret line="1766" column="0" lean-forward="true" selection-start-line="1766" selection-start-column="0" selection-end-line="1766" selection-end-column="0" />
<state relative-caret-position="632">
<caret line="1807" column="48" lean-forward="false" selection-start-line="1807" selection-start-column="48" selection-end-line="1807" selection-end-column="48" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -97,7 +97,6 @@
<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#61942#62299#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -190,9 +189,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="334" />
<option name="y" value="104" />
<component name="ProjectFrameBounds">
<option name="x" value="764" />
<option name="y" value="4" />
<option name="width" value="1430" />
<option name="height" value="920" />
</component>
... ... @@ -228,27 +227,6 @@
<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" />
</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="lang" 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="lang" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="zh-cn" 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="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
... ... @@ -375,7 +353,7 @@
<workItem from="1575773423431" duration="694000" />
<workItem from="1575776183372" duration="2267000" />
<workItem from="1575790089275" duration="377000" />
<workItem from="1575851041026" duration="5855000" />
<workItem from="1575851041026" duration="6193000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -388,7 +366,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="346322000" />
<option name="totallyTimeSpent" value="346660000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -400,7 +378,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="334" y="104" width="1430" height="920" extended-state="1" />
<frame x="764" y="4" width="1430" height="920" extended-state="0" />
<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.17518248" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
... ... @@ -813,10 +791,18 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="25" column="70" lean-forward="true" selection-start-line="25" selection-start-column="70" selection-end-line="25" selection-end-column="70" />
<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="408">
<caret line="1766" column="0" lean-forward="true" selection-start-line="1766" selection-start-column="0" selection-end-line="1766" selection-end-column="0" />
<state relative-caret-position="632">
<caret line="1807" column="48" lean-forward="false" selection-start-line="1807" selection-start-column="48" selection-end-line="1807" selection-end-column="48" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -884,18 +870,9 @@
<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#61942#62299#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="30" column="148" lean-forward="false" selection-start-line="30" selection-start-column="148" selection-end-line="30" selection-end-column="148" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -1799,6 +1799,13 @@ class User extends Api
$data = Db::name('invoice')
->insertGetId($param);
if(!empty($data)){
$res = Db::name('invoice')
->where('id',$data)
->find();
$order_id = explode(',',$res['order_id']);
Db::name('order')
->whereIn('id',$order_id)
->update(['invoice_status'=>1]);
$this->success('success');
}else{
$this->error('sql运行失败');
... ...
... ... @@ -28,7 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'pic_id', title: __('Pic_id'), operate:false},
{field: 'video_id', title: __('Video_id'), operate:false},
{field: 'total', title: __('Total'), operate:'BETWEEN'},
{field: 'invoice_status', title: __('Invoice_status'),formatter: Table.api.formatter.label,searchList:{'0': '未开票', '1': '已开票'}},
{field: 'invoice_status', title: __('Invoice_status'),formatter: Table.api.formatter.label,searchList:{'0': '未开票', '1':'已开票'}},
{field: 'status', title: __('Status'),formatter: Table.api.formatter.status,searchList:{'1': '待支付', '2': '已完成'}},
{field: 'num', title: __('Num'), operate:false},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
... ...