Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmupdate
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
李定达
fmupdate
Commits
a5eae3da
Commit
a5eae3da
authored
Sep 26, 2018
by
李定达
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.SaaS点餐小程序支持
parent
8a8cfe1d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
1 deletions
+30
-1
fmscupd/fmscupd.pro
+2
-1
fmscupd/fmtools.cpp
+28
-0
No files found.
fmscupd/fmscupd.pro
View file @
a5eae3da
...
...
@@ -11,7 +11,8 @@ DEFINES += QUAZIP_STATIC
#DEFINES += SHIQIJIA
#DEFINES += SHAN_LIN
#DEFINES += BALIBEITIAN
DEFINES
+=
AXMX
#DEFINES += AXMX
DEFINES
+=
SAAS
#DEFINES += AI_SEN
#DEFINES += TODAY
...
...
fmscupd/fmtools.cpp
View file @
a5eae3da
...
...
@@ -110,6 +110,11 @@ FmTools::FmTools()
qDebug
()
<<
"-----------------------------"
<<
storeid
;
#endif
#ifdef SAAS
m_partnerId
=
"66666"
;
#endif
#ifdef BALIBEITIAN
#define MY_CFG "FMPOS.ini"
...
...
@@ -301,6 +306,18 @@ QByteArray FmTools::GetUpdateData()
#elif AXMX
rObj
.
insert
(
JSON_STOREID
,
m_keyStoreId
);
rObj
.
insert
(
JSON_POSNO
,
m_keyPosId
);
#elif SAAS
QString
configfile
=
qApp
->
applicationDirPath
()
+
"/takeaway/config.ini"
;
QString
storeid
=
QSettings
(
configfile
,
QSettings
::
IniFormat
).
value
(
"base/storeid"
).
toString
();
QString
posId
=
QSettings
(
configfile
,
QSettings
::
IniFormat
).
value
(
"base/stationid"
).
toString
();
QString
parnetid
=
QSettings
(
configfile
,
QSettings
::
IniFormat
).
value
(
"base/parnetid"
).
toString
();
QString
relposid
=
parnetid
+
storeid
+
posId
;
rObj
.
insert
(
JSON_STOREID
,
storeid
);
rObj
.
insert
(
JSON_POSNO
,
relposid
);
#else
rObj
.
insert
(
JSON_STOREID
,
setting
.
value
(
m_keyStoreId
).
toString
());
rObj
.
insert
(
JSON_POSNO
,
setting
.
value
(
m_keyPosId
).
toString
());
...
...
@@ -338,6 +355,17 @@ QByteArray FmTools::GetReportData(QString planid, QString msg, QString updateSta
#elif AXMX
rObj
.
insert
(
JSON_STOREID
,
m_keyStoreId
);
rObj
.
insert
(
JSON_POSNO
,
m_keyPosId
);
#elif SAAS
QString
configfile
=
qApp
->
applicationDirPath
()
+
"/takeaway/config.ini"
;
QString
storeid
=
QSettings
(
configfile
,
QSettings
::
IniFormat
).
value
(
"base/storeid"
).
toString
();
QString
posId
=
QSettings
(
configfile
,
QSettings
::
IniFormat
).
value
(
"base/stationid"
).
toString
();
QString
parnetid
=
QSettings
(
configfile
,
QSettings
::
IniFormat
).
value
(
"base/parnetid"
).
toString
();
QString
relposid
=
parnetid
+
storeid
+
posId
;
rObj
.
insert
(
JSON_STOREID
,
storeid
);
rObj
.
insert
(
JSON_POSNO
,
relposid
);
#else
rObj
.
insert
(
JSON_STOREID
,
setting
.
value
(
m_keyStoreId
).
toString
());
rObj
.
insert
(
JSON_POSNO
,
setting
.
value
(
m_keyPosId
).
toString
());
...
...
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