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
1a566a9d
Commit
1a566a9d
authored
Sep 12, 2018
by
guanghui.cui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
扫码购 和 点取分离 返回值处理
parent
87e41dfc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletions
+7
-1
src/JsonModule.cpp
+6
-0
src/main.cpp
+1
-1
No files found.
src/JsonModule.cpp
View file @
1a566a9d
...
...
@@ -689,6 +689,12 @@ bool JsonModule::getPosResponseData(const std::string &odsResponse,IN const std:
||
fm_cmd
==
OPERATION_POS_CANCEL
||
fm_cmd
==
OPERATION_POS_REFUND_AGREE
||
fm_cmd
==
OPERATION_POS_REFUND_DISAGREE
||
fm_cmd
==
OPERATION_POS_APPOINTMENT_MAKEING_DONE
||
fm_cmd
==
OPERATION_POS_APPOINTMENT_DONE
||
fm_cmd
==
OPERATION_POS_APPOINTMENT_REFUND
||
fm_cmd
==
OPERATION_POS_APPOINTMENT_CONFIRM
||
fm_cmd
==
OPERATION_POS_SCANCODE_DONE
||
fm_cmd
==
OPERATION_POS_SCANCODE_REFUND
||
fm_cmd
==
REQUEST_TYPE_QUERY_ORDER_STAUS
)
{
result
=
_convertToOrderOperationReponseJson
(
odsResponse
.
data
());
...
...
src/main.cpp
View file @
1a566a9d
...
...
@@ -19,7 +19,7 @@
INITIALIZE_EASYLOGGINGPP
#define VERSION "1.0.6 beta
7
" //版本号
#define VERSION "1.0.6 beta
8
" //版本号
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