Skip to content

C
cdz_gateway_v2
Commit 033229d4 by banice
Options

修改充满自停的订单号改为outTradeNo

parent 3baf527c
Showing with 46 additions and 54 deletions
.idea/workspace.xml
...@@ -2,16 +2,7 @@ ...@@ -2,16 +2,7 @@
<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$/application/controller/update/QueryController.php" />
<change beforePath="" afterPath="$PROJECT_DIR$/application/model/GatewayUpdateModel.php" />
<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$/.staging" afterPath="$PROJECT_DIR$/.staging" />
<change beforePath="$PROJECT_DIR$/application/controller/accept/AccessController.php" afterPath="$PROJECT_DIR$/application/controller/accept/AccessController.php" />
<change beforePath="$PROJECT_DIR$/application/route/Api.php" afterPath="$PROJECT_DIR$/application/route/Api.php" />
<change beforePath="$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php" afterPath="$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php" /> <change beforePath="$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php" afterPath="$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php" />
<change beforePath="$PROJECT_DIR$/lib/log/Log.php" afterPath="$PROJECT_DIR$/lib/log/Log.php" />
<change beforePath="$PROJECT_DIR$/lib/remote/api/message/ChargerFullMessage.php" afterPath="$PROJECT_DIR$/lib/remote/api/message/ChargerFullMessage.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" />
...@@ -28,16 +19,6 @@ ...@@ -28,16 +19,6 @@
</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="Events.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/Events.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="191" column="26" lean-forward="false" selection-start-line="191" selection-start-column="26" selection-end-line="191" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="OfflinePowerState.php" pinned="false" current-in-tab="false"> <file leaf-file-name="OfflinePowerState.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -51,7 +32,7 @@ ...@@ -51,7 +32,7 @@
<file leaf-file-name="PowerController.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/business/power/PowerController.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="880">
<caret line="123" column="39" lean-forward="false" selection-start-line="123" selection-start-column="39" selection-end-line="123" selection-end-column="39" /> <caret line="123" column="39" lean-forward="false" selection-start-line="123" selection-start-column="39" selection-end-line="123" selection-end-column="39" />
<folding /> <folding />
</state> </state>
...@@ -70,21 +51,31 @@ ...@@ -70,21 +51,31 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ChargerState.php" pinned="false" current-in-tab="false"> <file leaf-file-name="ChargerState.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ChargerState.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="608"> <state relative-caret-position="597">
<caret line="212" column="92" lean-forward="false" selection-start-line="212" selection-start-column="92" selection-end-line="212" selection-end-column="92" /> <caret line="215" column="116" lean-forward="false" selection-start-line="215" selection-start-column="116" selection-end-line="215" selection-end-column="116" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ShedState.php" pinned="false" current-in-tab="true"> <file leaf-file-name="Order.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/cdz/order/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="488" column="20" lean-forward="false" selection-start-line="488" selection-start-column="20" selection-end-line="488" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ShedState.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ShedState.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ShedState.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="208"> <state relative-caret-position="304">
<caret line="235" column="48" lean-forward="false" selection-start-line="235" selection-start-column="48" selection-end-line="235" selection-end-column="48" /> <caret line="241" column="51" lean-forward="false" selection-start-line="241" selection-start-column="51" selection-end-line="241" selection-end-column="51" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -250,7 +241,7 @@ ...@@ -250,7 +241,7 @@
<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="1">
<option name="x" value="1920" /> <option name="x" value="1920" />
<option name="y" value="124" /> <option name="y" value="124" />
<option name="width" value="1855" /> <option name="width" value="1855" />
...@@ -384,15 +375,15 @@ ...@@ -384,15 +375,15 @@
<workItem from="1537328037530" duration="1134000" /> <workItem from="1537328037530" duration="1134000" />
<workItem from="1537348175687" duration="5908000" /> <workItem from="1537348175687" duration="5908000" />
<workItem from="1537612932767" duration="570000" /> <workItem from="1537612932767" duration="570000" />
<workItem from="1537838977788" duration="1144000" /> <workItem from="1537838977788" duration="2169000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="299563000" /> <option name="totallyTimeSpent" value="300588000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1920" y="124" width="1855" height="1057" extended-state="0" /> <frame x="1920" y="124" width="1855" height="1057" extended-state="1" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18753447" 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.18753447" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
...@@ -403,7 +394,7 @@ ...@@ -403,7 +394,7 @@
<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="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="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="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.18087319" 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="true" show_stripe_button="true" weight="0.18087319" 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="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="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" />
...@@ -431,13 +422,6 @@ ...@@ -431,13 +422,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/composer.lock">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-24">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Dockerfile"> <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">
...@@ -736,14 +720,6 @@ ...@@ -736,14 +720,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/power/PowerController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="123" column="39" lean-forward="false" selection-start-line="123" selection-start-column="39" selection-end-line="123" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/model/GatewayModel.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="0">
...@@ -786,18 +762,34 @@ ...@@ -786,18 +762,34 @@
</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/ShedState.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="304">
<caret line="212" column="92" lean-forward="false" selection-start-line="212" selection-start-column="92" selection-end-line="212" selection-end-column="92" /> <caret line="241" column="51" lean-forward="false" selection-start-line="241" selection-start-column="51" selection-end-line="241" selection-end-column="51" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ShedState.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/power/PowerController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="880">
<caret line="123" column="39" lean-forward="false" selection-start-line="123" selection-start-column="39" selection-end-line="123" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="488" column="20" lean-forward="false" selection-start-line="488" selection-start-column="20" selection-end-line="488" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<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="208"> <state relative-caret-position="597">
<caret line="235" column="48" lean-forward="false" selection-start-line="235" selection-start-column="48" selection-end-line="235" selection-end-column="48" /> <caret line="215" column="116" lean-forward="false" selection-start-line="215" selection-start-column="116" selection-end-line="215" selection-end-column="116" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
lib/cdz/order/state/ChargerState.php
...@@ -210,10 +210,10 @@ class ChargerState extends State ...@@ -210,10 +210,10 @@ class ChargerState extends State
$chargerFullMessage = new ChargerFullMessage(); $chargerFullMessage = new ChargerFullMessage();
$chargerFullMessage->setEndTime($this->nowDate); $chargerFullMessage->setEndTime($this->nowDate);
$chargerFullMessage->setStartTime(date('Y-m-d H:i:s',$this->order->getStartTime())); $chargerFullMessage->setStartTime(date('Y-m-d H:i:s', $this->order->getStartTime()));
$chargerFullMessage->setPurchaseTime($this->order->getPurchaseTime()); $chargerFullMessage->setPurchaseTime($this->order->getPurchaseTime());
$chargerFullMessage->setUserId($this->order->getUserId()); $chargerFullMessage->setUserId($this->order->getUserId());
$chargerFullMessage->setRemark($chargerFullMessage->getRemark() . '\n' . sprintf('%012x', $this->order->getId())); $chargerFullMessage->setRemark($chargerFullMessage->getRemark() . '(' . $this->order->getOutTradeNo() . ')');
$sendMessage = new SendMessage(); $sendMessage = new SendMessage();
if ($sendMessage->request($chargerFullMessage) === false) { if ($sendMessage->request($chargerFullMessage) === false) {
Log::error('send charger full message fail'); Log::error('send charger full message fail');
......
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