Skip to content

C
cdz_gateway_v2
Commit 0b69f017 by 杨苏杭
Options

card mac 修改为5字节

parent 00730ff9
Showing with 323 additions and 256 deletions
.idea/workspace.xml
...@@ -2,10 +2,14 @@ ...@@ -2,10 +2,14 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a4269ceb-5bf6-49dc-9b41-8690287f228c" name="Default" comment=""> <list default="true" id="a4269ceb-5bf6-49dc-9b41-8690287f228c" name="Default" comment="">
<change beforePath="" afterPath="$PROJECT_DIR$/readme.md" />
<change beforePath="$PROJECT_DIR$/.env" afterPath="$PROJECT_DIR$/.env" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/application/controller/card/PayRuleController.php" afterPath="$PROJECT_DIR$/application/controller/card/PayRuleController.php" /> <change beforePath="$PROJECT_DIR$/application/Events.php" afterPath="$PROJECT_DIR$/application/Events.php" />
<change beforePath="$PROJECT_DIR$/application/controller/business/charger/OverController.php" afterPath="$PROJECT_DIR$/application/controller/business/charger/OverController.php" />
<change beforePath="$PROJECT_DIR$/application/controller/business/power/PowerController.php" afterPath="$PROJECT_DIR$/application/controller/business/power/PowerController.php" />
<change beforePath="$PROJECT_DIR$/application/controller/card/BalanceController.php" afterPath="$PROJECT_DIR$/application/controller/card/BalanceController.php" />
<change beforePath="$PROJECT_DIR$/application/controller/card/charger/RequestController.php" afterPath="$PROJECT_DIR$/application/controller/card/charger/RequestController.php" />
<change beforePath="$PROJECT_DIR$/lib/Gateway.php" afterPath="$PROJECT_DIR$/lib/Gateway.php" />
<change beforePath="$PROJECT_DIR$/lib/remote/api/message/StartMessage.php" afterPath="$PROJECT_DIR$/lib/remote/api/message/StartMessage.php" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
...@@ -22,103 +26,101 @@ ...@@ -22,103 +26,101 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name=".env" pinned="false" current-in-tab="false"> <file leaf-file-name="OverController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.env"> <entry file="file://$PROJECT_DIR$/application/controller/business/charger/OverController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336"> <state relative-caret-position="710">
<caret line="21" column="15" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="37" selection-end-column="0" /> <caret line="166" column="27" lean-forward="true" selection-start-line="166" selection-start-column="27" selection-end-line="166" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Route.php" pinned="false" current-in-tab="false"> <file leaf-file-name="CardModel.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/route/Route.php"> <entry file="file://$PROJECT_DIR$/application/model/CardModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="96">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Api.php" pinned="false" current-in-tab="false"> <file leaf-file-name="BalanceController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/route/Api.php"> <entry file="file://$PROJECT_DIR$/application/controller/card/BalanceController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="944"> <state relative-caret-position="592">
<caret line="60" column="35" lean-forward="false" selection-start-line="60" selection-start-column="35" selection-end-line="60" selection-end-column="35" /> <caret line="45" column="53" lean-forward="false" selection-start-line="45" selection-start-column="53" selection-end-line="45" selection-end-column="53" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Controller.php" pinned="false" current-in-tab="false"> <file leaf-file-name="RequestController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/controller/Controller.php"> <entry file="file://$PROJECT_DIR$/application/controller/card/charger/RequestController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144"> <state relative-caret-position="928">
<caret line="14" column="19" lean-forward="false" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" /> <caret line="70" column="53" lean-forward="false" selection-start-line="70" selection-start-column="53" selection-end-line="70" selection-end-column="53" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="SendMessage.php" pinned="false" current-in-tab="false"> <file leaf-file-name="UserModel.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/remote/api/message/SendMessage.php"> <entry file="file://$PROJECT_DIR$/application/model/UserModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="464"> <state relative-caret-position="96">
<caret line="35" column="20" lean-forward="false" selection-start-line="35" selection-start-column="20" selection-end-line="35" selection-end-column="20" /> <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Events.php" pinned="false" current-in-tab="false"> <file leaf-file-name="StartController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/Events.php"> <entry file="file://$PROJECT_DIR$/application/controller/card/charger/StartController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="16"> <state relative-caret-position="340">
<caret line="43" column="0" lean-forward="false" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" /> <caret line="54" column="18" lean-forward="true" selection-start-line="54" selection-start-column="18" selection-end-line="54" selection-end-column="18" />
<folding> <folding />
<element signature="e#90#121#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="FailMessage.php" pinned="false" current-in-tab="true"> <file leaf-file-name="OverController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/remote/api/message/FailMessage.php"> <entry file="file://$PROJECT_DIR$/application/controller/card/charger/OverController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="911"> <state relative-caret-position="0">
<caret line="61" column="37" lean-forward="false" selection-start-line="61" selection-start-column="37" selection-end-line="61" selection-end-column="37" /> <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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PayRuleController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="PowerController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/controller/card/PayRuleController.php"> <entry file="file://$PROJECT_DIR$/application/controller/card/charger/PowerController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="576"> <state relative-caret-position="-476">
<caret line="46" column="78" lean-forward="false" selection-start-line="46" selection-start-column="78" selection-end-line="46" selection-end-column="78" /> <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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="BillTmpModel.php" pinned="false" current-in-tab="false"> <file leaf-file-name=".staging" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/model/BillTmpModel.php"> <entry file="file://$PROJECT_DIR$/.staging">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96"> <state relative-caret-position="560">
<caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" /> <caret line="35" column="0" lean-forward="false" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="StartController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Record.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/controller/business/charger/StartController.php"> <entry file="file://$PROJECT_DIR$/src/log/record/Record.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="608"> <state relative-caret-position="96">
<caret line="49" column="14" lean-forward="false" selection-start-line="49" selection-start-column="14" selection-end-line="49" selection-end-column="14" /> <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -171,8 +173,6 @@ ...@@ -171,8 +173,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/lib/cdz/card_order/state/TimeoutState.php" />
<option value="$PROJECT_DIR$/application/controller/card/charger/OverController.php" />
<option value="$PROJECT_DIR$/application/controller/card/charger/StartController.php" /> <option value="$PROJECT_DIR$/application/controller/card/charger/StartController.php" />
<option value="$PROJECT_DIR$/application/controller/card/charger/PowerController.php" /> <option value="$PROJECT_DIR$/application/controller/card/charger/PowerController.php" />
<option value="$PROJECT_DIR$/lib/notice/Notice.php" /> <option value="$PROJECT_DIR$/lib/notice/Notice.php" />
...@@ -198,8 +198,6 @@ ...@@ -198,8 +198,6 @@
<option value="$PROJECT_DIR$/application/controller/update/QueryController.php" /> <option value="$PROJECT_DIR$/application/controller/update/QueryController.php" />
<option value="$PROJECT_DIR$/application/model/CardModel.php" /> <option value="$PROJECT_DIR$/application/model/CardModel.php" />
<option value="$PROJECT_DIR$/application/model/UserModel.php" /> <option value="$PROJECT_DIR$/application/model/UserModel.php" />
<option value="$PROJECT_DIR$/application/controller/card/charger/RequestController.php" />
<option value="$PROJECT_DIR$/application/controller/card/BalanceController.php" />
<option value="$PROJECT_DIR$/application/controller/business/port/StateController.php" /> <option value="$PROJECT_DIR$/application/controller/business/port/StateController.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/Order.php" /> <option value="$PROJECT_DIR$/lib/cdz/order/Order.php" />
<option value="$PROJECT_DIR$/application/controller/business/charger/StartController.php" /> <option value="$PROJECT_DIR$/application/controller/business/charger/StartController.php" />
...@@ -215,13 +213,17 @@ ...@@ -215,13 +213,17 @@
<option value="$PROJECT_DIR$/lib/StateCode.php" /> <option value="$PROJECT_DIR$/lib/StateCode.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/state/ShedState.php" /> <option value="$PROJECT_DIR$/lib/cdz/order/state/ShedState.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php" /> <option value="$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php" />
<option value="$PROJECT_DIR$/application/Events.php" />
<option value="$PROJECT_DIR$/.staging" /> <option value="$PROJECT_DIR$/.staging" />
<option value="$PROJECT_DIR$/application/controller/business/charger/OverController.php" />
<option value="$PROJECT_DIR$/application/controller/business/power/PowerController.php" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/readme.md" /> <option value="$PROJECT_DIR$/readme.md" />
<option value="$PROJECT_DIR$/application/controller/card/PayRuleController.php" /> <option value="$PROJECT_DIR$/application/controller/card/PayRuleController.php" />
<option value="$PROJECT_DIR$/lib/remote/api/message/StartMessage.php" />
<option value="$PROJECT_DIR$/lib/Gateway.php" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/application/controller/business/power/PowerController.php" />
<option value="$PROJECT_DIR$/application/Events.php" />
<option value="$PROJECT_DIR$/application/controller/business/charger/OverController.php" />
<option value="$PROJECT_DIR$/application/controller/card/BalanceController.php" />
<option value="$PROJECT_DIR$/application/controller/card/charger/RequestController.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -252,11 +254,10 @@ ...@@ -252,11 +254,10 @@
<path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" /> <path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
</include_path> </include_path>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
<option name="x" value="276" /> <option name="x" value="1920" />
<option name="y" value="388" /> <option name="width" value="1920" />
<option name="width" value="1606" /> <option name="height" value="1080" />
<option name="height" value="1057" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" /> <ConfirmationsSetting value="2" id="Add" />
...@@ -276,6 +277,7 @@ ...@@ -276,6 +277,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="Scratches" /> <pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
...@@ -292,28 +294,78 @@ ...@@ -292,28 +294,78 @@
<path> <path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" /> <item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="business" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="business" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="charger" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="card" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="card" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="charger" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="card" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="port" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="model" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="lib" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="lib" type="2a2b976b:PhpTreeStructureProvider$1" />
</path> </path>
<path> <path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" /> <item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="lib" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="lib" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="remote" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="cdz" type="2a2b976b:PhpTreeStructureProvider$1" />
</path> </path>
<path> <path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" /> <item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="lib" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="lib" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="remote" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="cdz" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="card_order" type="2a2b976b:PhpTreeStructureProvider$1" />
</path> </path>
<path> <path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" /> <item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="lib" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="lib" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="remote" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="cdz" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="card_order" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="message" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="state" type="2a2b976b:PhpTreeStructureProvider$1" />
</path> </path>
<path> <path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" /> <item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
...@@ -323,7 +375,6 @@ ...@@ -323,7 +375,6 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -335,17 +386,17 @@ ...@@ -335,17 +386,17 @@
<property name="run.code.analysis.last.selected.profile" value="pProject Default" /> <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/lib" />
<recent name="$PROJECT_DIR$/application/model" />
<recent name="$PROJECT_DIR$/application" />
</key>
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/lib/cdz/card/state" /> <recent name="$PROJECT_DIR$/lib/cdz/card/state" />
<recent name="$PROJECT_DIR$/lib/remote/api/message" /> <recent name="$PROJECT_DIR$/lib/remote/api/message" />
<recent name="$PROJECT_DIR$/lib/cdz/order/state" /> <recent name="$PROJECT_DIR$/lib/cdz/order/state" />
<recent name="$PROJECT_DIR$/vendor/workerman/workerman/Protocols" /> <recent name="$PROJECT_DIR$/vendor/workerman/workerman/Protocols" />
</key> </key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/lib" />
<recent name="$PROJECT_DIR$/application/model" />
<recent name="$PROJECT_DIR$/application" />
</key>
</component> </component>
<component name="RunDashboard"> <component name="RunDashboard">
<option name="ruleStates"> <option name="ruleStates">
...@@ -436,32 +487,40 @@ ...@@ -436,32 +487,40 @@
<workItem from="1544837497794" duration="3399000" /> <workItem from="1544837497794" duration="3399000" />
<workItem from="1544859965685" duration="507000" /> <workItem from="1544859965685" duration="507000" />
<workItem from="1545006724025" duration="10602000" /> <workItem from="1545006724025" duration="10602000" />
<workItem from="1545555478035" duration="625000" /> <workItem from="1545555478035" duration="9652000" />
<workItem from="1546419608117" duration="787000" />
<workItem from="1546573432633" duration="796000" />
<workItem from="1546760026990" duration="1167000" />
<workItem from="1546852603214" duration="437000" />
<workItem from="1546829526654" duration="1960000" />
<workItem from="1546846912642" duration="675000" />
<workItem from="1546909384307" duration="2244000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="466206000" /> <option name="totallyTimeSpent" value="483299000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="276" y="388" width="1606" height="1057" extended-state="0" /> <frame x="1920" y="0" width="1920" height="1080" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.36700767" sideWeight="0.5" order="0" 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.20447284" sideWeight="0.5" order="0" 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.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" 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="7" side_tool="true" 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="7" 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="3" side_tool="false" 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="3" 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.32969216" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.040714994" sideWeight="0.5" order="8" 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="2" 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="2" 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.32969216" sideWeight="0.5" order="7" 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="1" side_tool="true" 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="1" side_tool="true" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16735967" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16735967" sideWeight="0.5" order="7" 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="2" side_tool="true" 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="3" 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="3" 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="2" 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="4" side_tool="false" 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="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" 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="false" content_ui="tabs" /> <window_info id="Message" 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="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" 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="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" 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="5" side_tool="false" content_ui="tabs" />
<window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.04158004" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Database Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Database Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Thumbnails" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32969216" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Thumbnails" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32969216" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" 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="combo" /> <window_info id="Hierarchy" active="false" anchor="right" 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="combo" />
...@@ -482,386 +541,381 @@ ...@@ -482,386 +541,381 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ExceptionState.php"> <entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Lib/Timer.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="250">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="84" column="27" lean-forward="false" selection-start-line="84" selection-start-column="27" selection-end-line="84" selection-end-column="27" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/PowerExceedState.php"> <entry file="file://$PROJECT_DIR$/Dockerfile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <caret line="0" column="45" lean-forward="false" selection-start-line="0" selection-start-column="45" selection-end-line="0" selection-end-column="45" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/PowerFullState.php"> <entry file="file://$PROJECT_DIR$/lib/remote/api/message/ChargerShedTimeOutMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ShedTimeoutState.php"> <entry file="file://$PROJECT_DIR$/application/model/GatewayModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="96">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/State.php"> <entry file="file://$PROJECT_DIR$/application/model/GatewayUpdateModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="96">
<caret line="13" column="15" lean-forward="false" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" /> <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/TimeoutState.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/port/StateController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="1152">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="88" column="33" lean-forward="false" selection-start-line="88" selection-start-column="33" selection-end-line="88" selection-end-column="33" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/station/gateway/port/Port.php"> <entry file="file://$PROJECT_DIR$/lib/remote/api/message/ChargerFullMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295"> <state relative-caret-position="336">
<caret line="140" column="6" lean-forward="false" selection-start-line="140" selection-start-column="6" selection-end-line="140" selection-end-column="6" /> <caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ShedState.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/Order.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="451"> <state relative-caret-position="5712">
<caret line="188" column="0" lean-forward="false" selection-start-line="188" selection-start-column="0" selection-end-line="188" selection-end-column="0" /> <caret line="362" column="20" lean-forward="false" selection-start-line="362" selection-start-column="20" selection-end-line="362" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/readme.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="16">
<caret line="1" column="26" lean-forward="false" selection-start-line="1" selection-start-column="26" selection-end-line="1" selection-end-column="26" />
</first_editor>
<second_editor />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/HeartController.php"> <entry file="file://$PROJECT_DIR$/application/model/Model.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="496">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="36" column="20" lean-forward="false" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/power/ShutdownController.php"> <entry file="file://$PROJECT_DIR$/application/controller/accept/AccessController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336"> <state relative-caret-position="1968">
<caret line="28" column="0" lean-forward="false" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> <caret line="142" column="43" lean-forward="false" selection-start-line="142" selection-start-column="43" selection-end-line="142" selection-end-column="43" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/setting/SettingController.php"> <entry file="file://$PROJECT_DIR$/start.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="296"> <state relative-caret-position="656">
<caret line="70" column="23" lean-forward="false" selection-start-line="70" selection-start-column="23" selection-end-line="70" selection-end-column="23" /> <caret line="41" column="28" lean-forward="false" selection-start-line="41" selection-start-column="28" selection-end-line="41" selection-end-column="28" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/BroadcastToAgent.php"> <entry file="file://$PROJECT_DIR$/application/controller/accept/CertifyController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336"> <state relative-caret-position="688">
<caret line="27" column="38" lean-forward="false" selection-start-line="27" selection-start-column="38" selection-end-line="27" selection-end-column="38" /> <caret line="94" column="38" lean-forward="false" selection-start-line="94" selection-start-column="38" selection-end-line="94" selection-end-column="38" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Lib/Timer.php"> <entry file="file://$PROJECT_DIR$/lib/remote/api/message/ChargerTimeoutMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250"> <state relative-caret-position="72">
<caret line="84" column="27" lean-forward="false" selection-start-line="84" selection-start-column="27" selection-end-line="84" selection-end-column="27" /> <caret line="49" column="20" lean-forward="false" selection-start-line="49" selection-start-column="20" selection-end-line="49" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Dockerfile"> <entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="240">
<caret line="0" column="45" lean-forward="false" selection-start-line="0" selection-start-column="45" selection-end-line="0" selection-end-column="45" /> <caret line="15" column="3" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/remote/api/message/ChargerShedTimeOutMessage.php"> <entry file="file://$PROJECT_DIR$/src/route/Route.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.staging"> <entry file="file://$PROJECT_DIR$/application/route/Api.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="560"> <state relative-caret-position="944">
<caret line="35" column="0" lean-forward="true" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" /> <caret line="60" column="35" lean-forward="false" selection-start-line="60" selection-start-column="35" selection-end-line="60" selection-end-column="35" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/model/GatewayModel.php"> <entry file="file://$PROJECT_DIR$/lib/remote/api/message/SendMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96"> <state relative-caret-position="464">
<caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" /> <caret line="35" column="20" lean-forward="false" selection-start-line="35" selection-start-column="20" selection-end-line="35" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/update/QueryController.php"> <entry file="file://$PROJECT_DIR$/application/controller/card/PayRuleController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450"> <state relative-caret-position="576">
<caret line="72" column="44" lean-forward="false" selection-start-line="72" selection-start-column="44" selection-end-line="72" selection-end-column="44" /> <caret line="46" column="78" lean-forward="false" selection-start-line="46" selection-start-column="78" selection-end-line="46" selection-end-column="78" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/model/GatewayUpdateModel.php"> <entry file="file://$PROJECT_DIR$/application/model/BillTmpModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96"> <state relative-caret-position="96">
<caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" /> <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/port/StateController.php"> <entry file="file://$PROJECT_DIR$/lib/remote/api/message/FailMessage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1152">
<caret line="88" column="33" lean-forward="false" selection-start-line="88" selection-start-column="33" selection-end-line="88" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/power/CapacityController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="912">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="61" column="37" lean-forward="false" selection-start-line="61" selection-start-column="37" selection-end-line="61" selection-end-column="37" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/power/PowerController.php"> <entry file="file://$PROJECT_DIR$/lib/remote/api/message/StartMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1696"> <state relative-caret-position="529">
<caret line="117" column="19" lean-forward="false" selection-start-line="117" selection-start-column="19" selection-end-line="117" selection-end-column="19" /> <caret line="41" column="0" lean-forward="false" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/remote/api/message/ChargerFullMessage.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/charger/StartController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336"> <state relative-caret-position="361">
<caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" /> <caret line="88" column="42" lean-forward="false" selection-start-line="88" selection-start-column="42" selection-end-line="88" selection-end-column="42" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/Gateway.php"> <entry file="file://$PROJECT_DIR$/lib/Gateway.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4240"> <state relative-caret-position="592">
<caret line="265" column="6" lean-forward="false" selection-start-line="265" selection-start-column="6" selection-end-line="265" selection-end-column="6" /> <caret line="37" column="49" lean-forward="false" selection-start-line="37" selection-start-column="49" selection-end-line="37" selection-end-column="49" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/model/OrderExceptionModel.php"> <entry file="file://$PROJECT_DIR$/application/start_register.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96"> <state relative-caret-position="0">
<caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/Order.php"> <entry file="file://$PROJECT_DIR$/application/start_gateway.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5712"> <state relative-caret-position="0">
<caret line="362" column="20" lean-forward="false" selection-start-line="362" selection-start-column="20" selection-end-line="362" selection-end-column="20" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/readme.md"> <entry file="file://$PROJECT_DIR$/application/start_businessworker.php">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]"> <provider selected="true" editor-type-id="text-editor">
<state split_layout="SPLIT"> <state relative-caret-position="0">
<first_editor relative-caret-position="16"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<caret line="1" column="26" lean-forward="false" selection-start-line="1" selection-start-column="26" selection-end-line="1" selection-end-column="26" />
</first_editor>
<second_editor />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/model/Model.php"> <entry file="file://$PROJECT_DIR$/src/response/Response.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="496"> <state relative-caret-position="1472">
<caret line="36" column="20" lean-forward="false" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" /> <caret line="95" column="21" lean-forward="false" selection-start-line="95" selection-start-column="21" selection-end-line="95" selection-end-column="21" />
<folding>
<marker date="1534755589000" expanded="true" signature="594:633" ph="SELECT ${$co... ${$this-&gt;table}" />
<marker date="1534755589000" expanded="true" signature="921:961" ph="SELECT ${$co... ${$this-&gt;table}" />
<marker date="1534755589000" expanded="true" signature="1253:1293" ph="SELECT ${$co... ${$this-&gt;table}" />
<marker date="1534755589000" expanded="true" signature="1443:1476" ph="SELECT * FRO... ${$this-&gt;table}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/accept/AccessController.php"> <entry file="file://$PROJECT_DIR$/application/controller/Controller.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1968"> <state relative-caret-position="160">
<caret line="142" column="43" lean-forward="false" selection-start-line="142" selection-start-column="43" selection-end-line="142" selection-end-column="43" /> <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/start_businessworker.php"> <entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="304">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="19" column="23" lean-forward="false" selection-start-line="19" selection-start-column="23" selection-end-line="19" selection-end-column="23" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/log/Log.php"> <entry file="file://$PROJECT_DIR$/lib/log/Log.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368"> <state relative-caret-position="528">
<caret line="29" column="6" lean-forward="false" selection-start-line="29" selection-start-column="6" selection-end-line="29" selection-end-column="6" /> <caret line="39" column="0" lean-forward="false" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/start.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="656"> <state relative-caret-position="464">
<caret line="41" column="28" lean-forward="false" selection-start-line="41" selection-start-column="28" selection-end-line="41" selection-end-column="28" /> <caret line="51" column="31" lean-forward="false" selection-start-line="51" selection-start-column="31" selection-end-line="51" selection-end-column="31" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/start_gateway.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/power/CapacityController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/start_register.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/power/PowerController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="2672">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="178" column="107" lean-forward="false" selection-start-line="178" selection-start-column="107" selection-end-line="178" selection-end-column="107" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/accept/CertifyController.php"> <entry file="file://$PROJECT_DIR$/application/Events.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="688"> <state relative-caret-position="832">
<caret line="94" column="38" lean-forward="false" selection-start-line="94" selection-start-column="38" selection-end-line="94" selection-end-column="38" /> <caret line="65" column="0" lean-forward="false" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/card_order/state/ChargerState.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="479"> <state relative-caret-position="2128">
<caret line="142" column="9" lean-forward="false" selection-start-line="142" selection-start-column="9" selection-end-line="142" selection-end-column="9" /> <caret line="152" column="26" lean-forward="false" selection-start-line="152" selection-start-column="26" selection-end-line="152" selection-end-column="26" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/remote/api/message/ChargerTimeoutMessage.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/card_order/state/WaitingState.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72"> <state relative-caret-position="0">
<caret line="49" column="20" lean-forward="false" selection-start-line="49" selection-start-column="20" selection-end-line="49" selection-end-column="20" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/StateCode.php"> <entry file="file://$PROJECT_DIR$/application/model/OrderExceptionModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="389"> <state relative-caret-position="96">
<caret line="32" column="10" lean-forward="false" selection-start-line="32" selection-start-column="10" selection-end-line="32" selection-end-column="10" /> <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/charger/OverController.php"> <entry file="file://$PROJECT_DIR$/lib/StateCode.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="181"> <state relative-caret-position="784">
<caret line="131" column="47" lean-forward="false" selection-start-line="131" selection-start-column="47" selection-end-line="131" selection-end-column="47" /> <caret line="54" column="10" lean-forward="false" selection-start-line="54" selection-start-column="10" selection-end-line="54" selection-end-column="10" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="549"> <state relative-caret-position="544">
<caret line="378" column="31" lean-forward="false" selection-start-line="378" selection-start-column="31" selection-end-line="378" selection-end-column="31" /> <caret line="52" column="20" lean-forward="false" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="20" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/composer.json"> <entry file="file://$PROJECT_DIR$/application/controller/update/QueryController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240"> <state relative-caret-position="1488">
<caret line="15" column="3" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="17" selection-end-column="0" /> <caret line="103" column="33" lean-forward="false" selection-start-line="103" selection-start-column="33" selection-end-line="103" selection-end-column="33" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.env"> <entry file="file://$PROJECT_DIR$/.staging">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336"> <state relative-caret-position="560">
<caret line="21" column="15" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="37" selection-end-column="0" /> <caret line="35" column="0" lean-forward="false" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/route/Route.php"> <entry file="file://$PROJECT_DIR$/src/log/record/Record.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="96">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/route/Api.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/charger/OverController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="944"> <state relative-caret-position="710">
<caret line="60" column="35" lean-forward="false" selection-start-line="60" selection-start-column="35" selection-end-line="60" selection-end-column="35" /> <caret line="166" column="27" lean-forward="true" selection-start-line="166" selection-start-column="27" selection-end-line="166" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/Controller.php"> <entry file="file://$PROJECT_DIR$/application/model/CardModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144"> <state relative-caret-position="96">
<caret line="14" column="19" lean-forward="false" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" /> <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/remote/api/message/SendMessage.php"> <entry file="file://$PROJECT_DIR$/application/model/UserModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="464"> <state relative-caret-position="96">
<caret line="35" column="20" lean-forward="false" selection-start-line="35" selection-start-column="20" selection-end-line="35" selection-end-column="20" /> <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/card/PayRuleController.php"> <entry file="file://$PROJECT_DIR$/application/controller/card/charger/RequestController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="576"> <state relative-caret-position="928">
<caret line="46" column="78" lean-forward="false" selection-start-line="46" selection-start-column="78" selection-end-line="46" selection-end-column="78" /> <caret line="70" column="53" lean-forward="false" selection-start-line="70" selection-start-column="53" selection-end-line="70" selection-end-column="53" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/model/BillTmpModel.php"> <entry file="file://$PROJECT_DIR$/application/controller/card/charger/PowerController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96"> <state relative-caret-position="-476">
<caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" /> <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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/charger/StartController.php"> <entry file="file://$PROJECT_DIR$/application/controller/card/charger/OverController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="608"> <state relative-caret-position="0">
<caret line="49" column="14" lean-forward="false" selection-start-line="49" selection-start-column="14" selection-end-line="49" selection-end-column="14" /> <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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/Events.php"> <entry file="file://$PROJECT_DIR$/application/controller/card/charger/StartController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="16"> <state relative-caret-position="340">
<caret line="43" column="0" lean-forward="false" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" /> <caret line="54" column="18" lean-forward="true" selection-start-line="54" selection-start-column="18" selection-end-line="54" selection-end-column="18" />
<folding> <folding />
<element signature="e#90#121#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/remote/api/message/FailMessage.php"> <entry file="file://$PROJECT_DIR$/application/controller/card/BalanceController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="911"> <state relative-caret-position="592">
<caret line="61" column="37" lean-forward="false" selection-start-line="61" selection-start-column="37" selection-end-line="61" selection-end-column="37" /> <caret line="45" column="53" lean-forward="false" selection-start-line="45" selection-start-column="53" selection-end-line="45" selection-end-column="53" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
application/Events.php
...@@ -64,6 +64,7 @@ class Events ...@@ -64,6 +64,7 @@ class Events
static::$redis->select('4'); static::$redis->select('4');
\Lib\log\Log::bootLog(); \Lib\log\Log::bootLog();
......
application/controller/business/charger/OverController.php
...@@ -108,27 +108,27 @@ class OverController extends Controller ...@@ -108,27 +108,27 @@ class OverController extends Controller
break; break;
case StateCode::FINISH_USER: //用户主动结束 case StateCode::FINISH_USER: //用户主动结束
$this->logRecord->setDesc('用户主动结束充电'); $this->logRecord->setDesc('用户主动结束充电->' . $state);
$orderState->toUserFinish(); $orderState->toUserFinish();
break; break;
case StateCode::FINISH_SHED_TIMEOUT: //端口脱落超时 case StateCode::FINISH_SHED_TIMEOUT: //端口脱落超时
$this->logRecord->setDesc('端口脱落超时结束'); $this->logRecord->setDesc('端口脱落超时结束->' . $state);
$orderState->toShedTimeoutState(); $orderState->toShedTimeoutState();
break; break;
case StateCode::FINISH_REFUND: //充电失败退款 case StateCode::FINISH_REFUND: //充电失败退款
$this->logRecord->setDesc('充电失败退款结束'); $this->logRecord->setDesc('充电失败退款结束->' . $state);
$orderState->toRefundFinish(); $orderState->toRefundFinish();
break; break;
case StateCode::FINISH_EXCEED: //功率超限 case StateCode::FINISH_EXCEED: //功率超限
$this->logRecord->setDesc('功率超限充电结束'); $this->logRecord->setDesc('功率超限充电结束->' . $state);
$orderState->toPowerExceedState(); $orderState->toPowerExceedState();
break; break;
case StateCode::FINISH_FULL: //充满自停 case StateCode::FINISH_FULL: //充满自停
$this->logRecord->setDesc('充满自停结束'); $this->logRecord->setDesc('充满自停结束->' . $state);
$orderState->toPowerFullState(); $orderState->toPowerFullState();
break; break;
case StateCode::FINISH_TIME_END: //充电时间结束 case StateCode::FINISH_TIME_END: //充电时间结束
$this->logRecord->setDesc('充电时间完结束'); $this->logRecord->setDesc('充电时间完结束->' . $state);
$orderState->toTimeoutState(); $orderState->toTimeoutState();
break; break;
...@@ -164,6 +164,8 @@ class OverController extends Controller ...@@ -164,6 +164,8 @@ class OverController extends Controller
} }
} else { } else {
Log::error('redis can not find');
$this->logRecord->setException(0); $this->logRecord->setException(0);
$this->logRecord->setDesc('redis副本订单状态异常，非可结束订单状态'); $this->logRecord->setDesc('redis副本订单状态异常，非可结束订单状态');
......
application/controller/business/power/PowerController.php
...@@ -176,7 +176,7 @@ class PowerController extends Controller ...@@ -176,7 +176,7 @@ class PowerController extends Controller
if ($i === ($count - 1)) { if ($i === ($count - 1)) {
$orderModel = new OrderModel(); $orderModel = new OrderModel();
$capacity = hexdec($capacitys[$i]); $capacity = hexdec($capacitys[$i]);
$orderModel->update(['start_capacity' => hexdec($capacitys[0])], 'id =' . $orderId . 'and start_capacity = -1'); $orderModel->update(['start_capacity' => hexdec($capacitys[0])], 'id =' . $orderId . ' and start_capacity = -1');
$orderModel->update([ $orderModel->update([
'end_capacity' => $capacity, 'end_capacity' => $capacity,
], 'id = ' . $orderId); ], 'id = ' . $orderId);
......
application/controller/card/BalanceController.php
...@@ -12,6 +12,7 @@ namespace Application\controller\card; ...@@ -12,6 +12,7 @@ namespace Application\controller\card;
use Application\controller\Controller; use Application\controller\Controller;
use Application\model\CardModel; use Application\model\CardModel;
use Application\model\UserModel; use Application\model\UserModel;
use Lib\log\Log;
class BalanceController extends Controller class BalanceController extends Controller
{ {
...@@ -19,7 +20,7 @@ class BalanceController extends Controller ...@@ -19,7 +20,7 @@ class BalanceController extends Controller
'32' => [ '32' => [
'card_id' => 4 'card_id' => 5,
] ]
]; ];
...@@ -33,11 +34,16 @@ class BalanceController extends Controller ...@@ -33,11 +34,16 @@ class BalanceController extends Controller
$cardModel = new CardModel(); $cardModel = new CardModel();
$userId = $cardModel->getColumn('user_id', 'card_number = ' . $cardId); Log::debug($cardId);
$userId = $cardModel->getColumn('user_id', 'mac = ' . "'$cardId'");
Log::debug($userId);
if (isset($userId)) { if (isset($userId)) {
$userModel = new UserModel(); $userModel = new UserModel();
$balance = $userModel->getColumn('balance', 'id = ' . $userId); $balance = $userModel->getColumn('wallet_balance', 'id = ' . $userId);
} }
$balance = isset($balance) ? $balance : 0; $balance = isset($balance) ? $balance : 0;
......
application/controller/card/charger/RequestController.php
...@@ -25,7 +25,7 @@ class RequestController extends Controller ...@@ -25,7 +25,7 @@ class RequestController extends Controller
'33' => [ '33' => [
'type' => 1, 'type' => 1,
'logic_id' => 1, 'logic_id' => 1,
'card_id' => 4, 'card_id' => 5,
'time' => 2, 'time' => 2,
'price' => 2, 'price' => 2,
], ],
...@@ -62,11 +62,13 @@ class RequestController extends Controller ...@@ -62,11 +62,13 @@ class RequestController extends Controller
$cardModel = new CardModel(); $cardModel = new CardModel();
$userId = $cardModel->getColumn('user_id', 'card_number = ' . $cardId); $userId = $cardModel->getColumn('user_id', 'mac = ' . "'$cardId'");
Log::debug($userId);
if (isset($userId)) { if (isset($userId)) {
$userModel = new UserModel(); $userModel = new UserModel();
$balance = $userModel->getColumn('balance', 'id = ' . $userId); $balance = $userModel->getColumn('wallet_balance', 'id = ' . $userId);
} }
$balance = isset($balance) ? $balance : 0; $balance = isset($balance) ? $balance : 0;
if ((int)$balance < (int)$price) { if ((int)$balance < (int)$price) {
......
lib/Gateway.php
...@@ -35,7 +35,7 @@ class Gateway ...@@ -35,7 +35,7 @@ class Gateway
* *
* @var string * @var string
*/ */
public static $registerAddress = 'webapppush.default:1239'; public static $registerAddress = '100.124.0.5:1239';
//public static $registerAddress = '127.0.0.1:1236'; //public static $registerAddress = '127.0.0.1:1236';
......
lib/remote/api/message/StartMessage.php
...@@ -16,7 +16,7 @@ class StartMessage extends Message ...@@ -16,7 +16,7 @@ class StartMessage extends Message
/** /**
* @var string * @var string
*/ */
private $first = '充电已经开始，请注意接收消息'; private $first = '您的爱车已开始充电，预计在%s结束喔';
/** /**
* @var string * @var string
...@@ -38,6 +38,8 @@ class StartMessage extends Message ...@@ -38,6 +38,8 @@ class StartMessage extends Message
*/ */
private $remark = '感谢您的使用'; private $remark = '感谢您的使用';
private $purchaseTime = 0;
/** /**
* StartMessage constructor. * StartMessage constructor.
*/ */
...@@ -74,7 +76,7 @@ class StartMessage extends Message ...@@ -74,7 +76,7 @@ class StartMessage extends Message
'color' => '#333', 'color' => '#333',
], ],
'keyword3' => [ 'keyword3' => [
'value' => number_format($this->amount / 100, 2), 'value' => '¥' . number_format($this->amount / 100, 2),
'color' => '#333', 'color' => '#333',
], ],
'remark' => [ 'remark' => [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment