Skip to content

J
Jz-Php
提交 9bb52069 authored 作者: chengye's avatar chengye
浏览文件
操作

修复账单显示错误

上级 094d6308
隐藏空白字符变更
内嵌 并排
正在显示 包含 169 行增加 和 14 行删除
.idea/workspace.xml
浏览文件 @ 9bb52069
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php"> <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527"> <state relative-caret-position="465">
<caret line="44" column="18" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" /> <caret line="48" column="78" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="78" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>last_date</find> <find>last_date</find>
<find>$sm</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -64,10 +65,10 @@ ...@@ -64,10 +65,10 @@
</include_path> </include_path>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1358" /> <option name="x" value="1544" />
<option name="y" value="-125" /> <option name="y" value="-85" />
<option name="width" value="1936" /> <option name="width" value="2181" />
<option name="height" value="1056" /> <option name="height" value="1100" />
</component> </component>
<component name="ProjectView"> <component name="ProjectView">
<navigator proportions="" version="1"> <navigator proportions="" version="1">
...@@ -137,18 +138,18 @@ ...@@ -137,18 +138,18 @@
<updated>1578039975763</updated> <updated>1578039975763</updated>
<workItem from="1578039979308" duration="88000" /> <workItem from="1578039979308" duration="88000" />
<workItem from="1578817951649" duration="618000" /> <workItem from="1578817951649" duration="618000" />
<workItem from="1578900535997" duration="48000" /> <workItem from="1578900535997" duration="1087000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="754000" /> <option name="totallyTimeSpent" value="1793000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1358" y="-125" width="1936" height="1056" extended-state="6" /> <frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25452608" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25452608" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
...@@ -161,7 +162,7 @@ ...@@ -161,7 +162,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" /> <window_info anchor="bottom" id="Database Changes" order="8" />
<window_info anchor="bottom" id="Version Control" order="9" /> <window_info anchor="bottom" id="Version Control" order="9" />
<window_info anchor="bottom" id="Terminal" order="10" /> <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.27391306" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
...@@ -208,10 +209,163 @@ ...@@ -208,10 +209,163 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$USER_HOME$/Desktop/flow(1).php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="740" column="11" lean-forward="true" selection-start-line="740" selection-start-column="11" selection-end-line="740" selection-end-column="11" />
<folding>
<element signature="n#style#0;n#div#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#td#2;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#1;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#514#520#0" expanded="true" />
<element signature="e#520#526#0" expanded="true" />
<element signature="e#526#532#0" expanded="true" />
<element signature="e#532#538#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#0;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#600#606#0" expanded="true" />
<element signature="e#606#612#0" expanded="true" />
<element signature="e#612#618#0" expanded="true" />
<element signature="e#618#624#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#1;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#680#686#0" expanded="true" />
<element signature="e#686#692#0" expanded="true" />
<element signature="e#692#698#0" expanded="true" />
<element signature="e#698#704#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#2;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#760#766#0" expanded="true" />
<element signature="e#767#773#0" expanded="true" />
<element signature="n#style#0;n#a#0;n#span#0;n#li#2;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#3;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#891#897#0" expanded="true" />
<element signature="e#897#903#0" expanded="true" />
<element signature="e#903#909#0" expanded="true" />
<element signature="e#909#915#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#4;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#977#983#0" expanded="true" />
<element signature="e#983#989#0" expanded="true" />
<element signature="e#989#995#0" expanded="true" />
<element signature="e#995#1001#0" expanded="true" />
<element signature="n#style#0;n#a#0;n#span#0;n#li#4;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#1;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#1127#1133#0" expanded="true" />
<element signature="e#1133#1139#0" expanded="true" />
<element signature="e#1139#1145#0" expanded="true" />
<element signature="e#1145#1151#0" expanded="true" />
<element signature="n#style#0;n#span#2;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#3;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#4;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#0;n#ul#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#1;n#ul#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#1;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#1;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#514#520#0" expanded="true" />
<element signature="e#520#526#0" expanded="true" />
<element signature="e#526#532#0" expanded="true" />
<element signature="e#532#538#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#0;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#652#658#0" expanded="true" />
<element signature="e#658#664#0" expanded="true" />
<element signature="e#664#670#0" expanded="true" />
<element signature="e#670#676#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#1;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#734#740#0" expanded="true" />
<element signature="e#740#746#0" expanded="true" />
<element signature="e#746#752#0" expanded="true" />
<element signature="e#752#758#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#2;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#814#820#0" expanded="true" />
<element signature="e#821#827#0" expanded="true" />
<element signature="e#854#860#0" expanded="true" />
<element signature="e#861#867#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#4;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#922#928#0" expanded="true" />
<element signature="e#928#934#0" expanded="true" />
<element signature="e#934#940#0" expanded="true" />
<element signature="e#940#946#0" expanded="true" />
<element signature="n#style#0;n#span#1;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#1003#1009#0" expanded="true" />
<element signature="e#1009#1015#0" expanded="true" />
<element signature="e#1015#1021#0" expanded="true" />
<element signature="e#1021#1027#0" expanded="true" />
<element signature="n#style#0;n#span#2;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#3;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#4;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#0;n#ul#1;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#1;n#ul#1;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#1;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#0;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#1;n#td#0;n#tr#0;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#514#520#0" expanded="true" />
<element signature="e#520#526#0" expanded="true" />
<element signature="e#526#532#0" expanded="true" />
<element signature="e#532#538#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#0;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#599#605#0" expanded="true" />
<element signature="e#605#611#0" expanded="true" />
<element signature="e#611#617#0" expanded="true" />
<element signature="e#617#623#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#1;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#681#687#0" expanded="true" />
<element signature="e#687#693#0" expanded="true" />
<element signature="e#693#699#0" expanded="true" />
<element signature="e#699#705#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#2;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#761#767#0" expanded="true" />
<element signature="e#768#774#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#3;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#831#837#0" expanded="true" />
<element signature="e#838#844#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#4;n#ul#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#906#912#0" expanded="true" />
<element signature="e#912#918#0" expanded="true" />
<element signature="e#918#924#0" expanded="true" />
<element signature="e#924#930#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#987#993#0" expanded="true" />
<element signature="e#993#999#0" expanded="true" />
<element signature="e#999#1005#0" expanded="true" />
<element signature="e#1005#1011#0" expanded="true" />
<element signature="n#style#0;n#span#1;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#2;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#3;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#0;n#ul#1;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#li#1;n#ul#1;n#span#0;n#td#0;n#tr#1;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#1;n#td#0;n#tr#2;n#tbody#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php"> <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527"> <state relative-caret-position="465">
<caret line="44" column="18" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" /> <caret line="48" column="78" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="78" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
application/em/model/EmInvoice.php
浏览文件 @ 9bb52069
...@@ -42,10 +42,11 @@ class EmInvoice extends Base ...@@ -42,10 +42,11 @@ class EmInvoice extends Base
->page($Nowpage, $limits) ->page($Nowpage, $limits)
->select() ->select()
->toarray(); ->toarray();
dd($data); foreach ($data as &$item){
foreach ($data as &$item){ if($item['payment_balance'] == '') $item['payment_balance'] = 0;
$item['paid_amount'] = $item['payment_amount'] - $item['payment_balance']; $item['paid_amount'] = $item['payment_amount'] - $item['payment_balance'];
if(is_int($item['settle_amount']) && $item['settle_balance']){ if(is_int($item['settle_amount']) && $item['settle_balance']){
if($item['settle_balance'] == '') $item['settle_balance'] = 0;
$item['sett_amount'] = $item['settle_amount'] - $item['settle_balance']; $item['sett_amount'] = $item['settle_amount'] - $item['settle_balance'];
} else { } else {
$item['sett_amount'] = ''; $item['sett_amount'] = '';
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论