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
2483b050
Commit
2483b050
authored
Feb 28, 2018
by
guanghui.cui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
格式修改
parent
d746014e
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
5 deletions
+3
-5
src/JsonModule.cpp
+1
-4
src/SocketModule.cpp
+0
-0
src/SocketModule.h
+0
-0
src/main.cpp
+2
-1
No files found.
src/JsonModule.cpp
View file @
2483b050
...
@@ -276,10 +276,7 @@ bool JsonModule::getPushOrders(IN const char* json,OUT orderObj &order)
...
@@ -276,10 +276,7 @@ bool JsonModule::getPushOrders(IN const char* json,OUT orderObj &order)
{
{
rapidjson
::
Value
&
points_obj
=
orderContent_obj
[
"points"
];
rapidjson
::
Value
&
points_obj
=
orderContent_obj
[
"points"
];
rapidjson
::
Value
&
totalPoint
=
points_obj
[
"totalPoint"
];
rapidjson
::
Value
&
totalPoint
=
points_obj
[
"totalPoint"
];
char
temp
[
20
]
=
{
0
};
order
.
bonusInfo
.
summary
=
std
::
to_string
(
totalPoint
.
GetInt
());
int
iPoint
=
totalPoint
.
GetInt
();
sprintf
(
temp
,
"%d"
,
iPoint
);
order
.
bonusInfo
.
summary
=
temp
;
//积分信息详情
//积分信息详情
{
{
...
...
src/SocketModule.cpp
View file @
2483b050
src/SocketModule.h
View file @
2483b050
src/main.cpp
View file @
2483b050
...
@@ -67,6 +67,7 @@ void* listen_pos_func(void* arg)
...
@@ -67,6 +67,7 @@ void* listen_pos_func(void* arg)
{
{
g_init_data
=
posRequestData
;
g_init_data
=
posRequestData
;
jsonTool
.
getPosResponseData
(
100
,
"successful!"
,
responseData
);
jsonTool
.
getPosResponseData
(
100
,
"successful!"
,
responseData
);
LOG
(
INFO
)
<<
"POS init data:"
<<
g_init_data
.
c_str
();
}
else
}
else
{
{
jsonTool
.
getPosResponseData
(
101
,
"invalid initdata!"
,
responseData
);
jsonTool
.
getPosResponseData
(
101
,
"invalid initdata!"
,
responseData
);
...
@@ -141,7 +142,7 @@ int main()
...
@@ -141,7 +142,7 @@ int main()
/// 注册回调函数
/// 注册回调函数
el
::
Helpers
::
installPreRollOutCallback
(
logRolloutHandler
);
el
::
Helpers
::
installPreRollOutCallback
(
logRolloutHandler
);
LOG
(
INFO
)
<<
"---------
程序启动
---------"
;
LOG
(
INFO
)
<<
"---------
software start
---------"
;
// 读取配置文件信息
// 读取配置文件信息
std
::
string
strIniPath
(
strBinPath
.
data
());
std
::
string
strIniPath
(
strBinPath
.
data
());
...
...
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