Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
FmTakeaway
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
shangshang.dai
FmTakeaway
Commits
945de392
Commit
945de392
authored
Aug 31, 2016
by
ss.dai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改门店状态字段名
parent
7d64e3ff
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
fmTakeaway/Network/billSocket.cpp
+0
-1
fmTakeaway/preDefine.h
+3
-2
run/config.ini
+2
-1
No files found.
fmTakeaway/Network/billSocket.cpp
View file @
945de392
...
@@ -48,7 +48,6 @@ bool BillSocket::Request(const QJsonObject &requestJson, QJsonObject &recvJson,
...
@@ -48,7 +48,6 @@ bool BillSocket::Request(const QJsonObject &requestJson, QJsonObject &recvJson,
return
false
;
return
false
;
}
}
recvJson
=
QJsonDocument
::
fromJson
(
recvArray
).
object
();
recvJson
=
QJsonDocument
::
fromJson
(
recvArray
).
object
();
qDebug
()
<<
recvJson
;
reply
->
deleteLater
();
reply
->
deleteLater
();
return
true
;
return
true
;
...
...
fmTakeaway/preDefine.h
View file @
945de392
...
@@ -57,8 +57,9 @@
...
@@ -57,8 +57,9 @@
#define JSON_DELIVERYNAME "deliveryman_name"
#define JSON_DELIVERYNAME "deliveryman_name"
#define JSON_DELIVERYPHONE "deliveryman_phone"
#define JSON_DELIVERYPHONE "deliveryman_phone"
#define JSON_ORDER "order"
#define JSON_ORDER "order"
#define JSON_SHOPSTATUS "channel_shops"
#define JSON_SHOPSTATUS "channels"
#define JSON_SHOPSTATUSDESC "business_status_desc"
#define JSON_SHOPSTATUSDESC "status_desc"
#define JSON_SHOPCHANNELNAME "name"
// 订单的操作码
// 订单的操作码
#define OPERATION_GETDELIVERS "getDelivers"
#define OPERATION_GETDELIVERS "getDelivers"
...
...
run/config.ini
View file @
945de392
[FmServer]
[FmServer]
url
=
http://waimai
test
.freemudorder.com/api
url
=
http://waimai
api
.freemudorder.com/api
[RefundListener]
[RefundListener]
port
=
34953
port
=
34953
\ No newline at end of file
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