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
ad858604
Commit
ad858604
authored
May 23, 2018
by
guanghui.cui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加订单漂移字段
parent
3f8c5797
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletions
+6
-1
base/CommonStruct.h
+1
-0
src/JsonModule.cpp
+4
-0
src/main.cpp
+1
-1
No files found.
base/CommonStruct.h
View file @
ad858604
...
@@ -186,6 +186,7 @@ struct orderObj
...
@@ -186,6 +186,7 @@ struct orderObj
std
::
string
pickup_code
;
//自取订单取餐码
std
::
string
pickup_code
;
//自取订单取餐码
std
::
string
pickup_point
;
//自取订单取餐处
std
::
string
pickup_point
;
//自取订单取餐处
std
::
string
invoice_pickup_code
;
//订单发票提出码
std
::
string
invoice_pickup_code
;
//订单发票提出码
std
::
string
order_drift
;
//订单漂移
store
storeInfo
;
//门店信息
store
storeInfo
;
//门店信息
delivery
deliveryInfo
;
//配送信息
delivery
deliveryInfo
;
//配送信息
...
...
src/JsonModule.cpp
View file @
ad858604
...
@@ -159,6 +159,7 @@ bool JsonModule::getPushOrders(IN const char* json,OUT orderObj &order)
...
@@ -159,6 +159,7 @@ bool JsonModule::getPushOrders(IN const char* json,OUT orderObj &order)
GetJsonStringSafe
(
document
,
"token"
);
GetJsonStringSafe
(
document
,
"token"
);
GetJsonStringSafe
(
document
,
"ver"
);
GetJsonStringSafe
(
document
,
"ver"
);
order
.
order_drift
=
GetJsonStringSafe
(
document
,
"order_drift"
);
//配送信息
//配送信息
std
::
string
delivery_type
;
std
::
string
delivery_type
;
...
@@ -942,6 +943,9 @@ std::string JsonModule::_convertToNewOrderJson(orderObj &obj)
...
@@ -942,6 +943,9 @@ std::string JsonModule::_convertToNewOrderJson(orderObj &obj)
writer
.
Key
(
"invoice_pickup_code"
);
writer
.
Key
(
"invoice_pickup_code"
);
writer
.
String
(
obj
.
invoice_pickup_code
.
c_str
());
writer
.
String
(
obj
.
invoice_pickup_code
.
c_str
());
writer
.
Key
(
"order_drift"
);
writer
.
String
(
obj
.
order_drift
.
c_str
());
//----------------门店信息----------------
//----------------门店信息----------------
writer
.
Key
(
"store"
);
writer
.
Key
(
"store"
);
writer
.
StartObject
();
writer
.
StartObject
();
...
...
src/main.cpp
View file @
ad858604
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
INITIALIZE_EASYLOGGINGPP
INITIALIZE_EASYLOGGINGPP
#define VERSION "1.0.4
.1
" //版本号
#define VERSION "1.0.4
Beta2
" //版本号
std
::
string
g_init_data
;
std
::
string
g_init_data
;
std
::
string
g_init_data_ods_back
;
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