Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
familyMart_takeaway
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guanghui.cui
familyMart_takeaway
Commits
47f87895
Commit
47f87895
authored
Aug 04, 2020
by
wuyang.zou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pos Response Ods Push Order Result
wait test Version:2.1.1
parent
39274137
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletions
+10
-1
src/JsonModule.cpp
+8
-0
src/JsonModule.h
+1
-0
src/main.cpp
+1
-1
No files found.
src/JsonModule.cpp
View file @
47f87895
...
...
@@ -1986,6 +1986,7 @@ bool JsonModule::_getOrderResponseJson(IN const std::string& posResponse, IN con
uint64_t
pk_id
=
GetJsonIntSafe
(
document2
,
"pk_id"
);
std
::
string
child_store_id
;
if
(
document2
.
HasMember
(
"shopInfo"
))
{
rapidjson
::
Value
&
shopInfo_obj
=
document2
[
"shopInfo"
];
...
...
@@ -2019,6 +2020,12 @@ bool JsonModule::_getOrderResponseJson(IN const std::string& posResponse, IN con
writer
.
Key
(
"pk_id"
);
writer
.
Uint64
(
pk_id
);
writer
.
Key
(
"store_id"
);
writer
.
String
(
_store_id
.
c_str
()
);
writer
.
Key
(
"pos_id"
);
writer
.
String
(
_pos_id
.
c_str
()
);
writer
.
Key
(
"child_store_id"
);
writer
.
String
(
child_store_id
.
c_str
());
...
...
@@ -2328,6 +2335,7 @@ void JsonModule::setInitData(IN const char* data)
}
_store_id
=
document
[
"store_id"
].
GetString
();
_pos_id
=
document
[
"pos_id"
].
GetString
();
}
int
JsonModule
::
_getODSStatusByPOSReq
(
int
fm_cmd
)
...
...
src/JsonModule.h
View file @
47f87895
...
...
@@ -109,6 +109,7 @@ public:
private
:
std
::
string
_store_id
;
//门店号
std
::
string
_pos_id
;
//POS编号;
private
:
std
::
string
_getDeliveryTypeString
(
int
type
);
...
...
src/main.cpp
View file @
47f87895
...
...
@@ -22,7 +22,7 @@
INITIALIZE_EASYLOGGINGPP
#define VERSION "1.2.
1
RC " //版本号
#define VERSION "1.2.
2
RC " //版本号
std
::
string
g_init_data
;
std
::
string
g_init_data_ods_back
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment