Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmp_vip
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
xiaojing.zhang
fmp_vip
Commits
fa12d19d
Commit
fa12d19d
authored
Oct 19, 2017
by
NitefullWind
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 修改接口和数据库字段名。
parent
11ce624b
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
106 additions
and
106 deletions
+106
-106
fmvip/database/dbop.cpp
+13
-16
fmvip/database/dbop.h
+3
-3
fmvip/items/order.cpp
+10
-10
fmvip/items/order.h
+8
-8
fmvip/items/pay.cpp
+9
-9
fmvip/items/pay.h
+9
-9
fmvip/task/taskfinal.cpp
+4
-4
fmvip/task/taskpay.cpp
+3
-3
fmvip/task/taskrefund.cpp
+2
-2
fmvip/windows/fmviprefund.cpp
+3
-3
tests/testitem/tst_testitem.cpp
+36
-33
tests/testplugin/tst_testplugin.cpp
+6
-6
No files found.
fmvip/database/dbop.cpp
View file @
fa12d19d
...
...
@@ -47,18 +47,15 @@ bool DBOP::CreateTable(const QString &tableName)
{
QString
tableOrderSql
=
"CREATE TABLE [Order]("
"[id] INTEGER PRIMARY KEY autoincrement, "
"[
trans
_id] VARCHAR(50), "
"[fm_id] VARCHAR(50), "
"[
order
_id] VARCHAR(50), "
"[fm_
order_
id] VARCHAR(50), "
"[order_amount] INT DEFAULT 0, "
"[paid_amount] INT DEFAULT 0, "
"[undis_amount] INT DEFAULT 0, "
"[store_id] VARCHAR(50), "
"[pos_id] VARCHAR(50), "
"[operator_id] VARCHAR(50), "
"[business_date] VARCHAR(50), "
"[fm_open_id] VARCHAR(50), "
"[products] TEXT"
"[settle] BOOL DEFAULT 0"
"[settle] BOOL DEFAULT 0,"
"[storeInfoId] INTEGER"
");"
;
QString
tablePaySql
=
"CREATE TABLE [Pay]("
"[id] INTEGER PRIMARY KEY autoincrement, "
...
...
@@ -69,8 +66,8 @@ bool DBOP::CreateTable(const QString &tableName)
"[dis_amount] INT DEFAULT 0, "
"[account] VARCHAR(50), "
"[trans_id] VARCHAR(50), "
"[
payTransI
d] VARCHAR(50),"
"[order
Id
] INTEGER"
"[
fm_trans_i
d] VARCHAR(50),"
"[order
DBID
] INTEGER"
");"
;
QString
tableStoreInfoSql
=
"CREATE TABLE [StoreInfo]("
"[id] INTEGER PRIMARY KEY autoincrement, "
...
...
@@ -145,24 +142,24 @@ bool DBOP::Save(FMItem::Item *item)
return
isOk
;
}
void
DBOP
::
GetOrderBy
TransId
(
const
QString
&
trans
Id
,
Order
*
order
)
void
DBOP
::
GetOrderBy
OrderId
(
const
QString
&
order
Id
,
Order
*
order
)
{
Q_ASSERT
(
order
!=
NULL
);
QSqlQuery
query
;
QString
condition
=
QString
(
"
trans_id == '%1'"
).
arg
(
trans
Id
);
QString
condition
=
QString
(
"
order_id == '%1'"
).
arg
(
order
Id
);
bool
isOk
=
Instance
()
->
_db
->
find
(
TABLE_ORDER
,
query
,
QStringList
(),
condition
);
if
(
isOk
&&
query
.
next
())
{
order
->
SetPropertiesBySqlRecord
(
query
.
record
());
}
else
{
FMP_WARN
()
<<
"Don't find order: "
<<
trans
Id
;
FMP_WARN
()
<<
"Don't find order: "
<<
order
Id
;
}
}
QSharedPointer
<
FMItem
::
Order
>
DBOP
::
GetOrderBy
TransId
(
const
QString
&
trans
Id
)
QSharedPointer
<
FMItem
::
Order
>
DBOP
::
GetOrderBy
OrderId
(
const
QString
&
order
Id
)
{
QSharedPointer
<
FMItem
::
Order
>
order
(
new
Order
);
GetOrderBy
TransId
(
trans
Id
,
order
.
data
());
GetOrderBy
OrderId
(
order
Id
,
order
.
data
());
return
order
;
}
...
...
@@ -187,11 +184,11 @@ QSharedPointer<FMItem::Order> DBOP::GetOrderByDBId(unsigned int DBID)
return
order
;
}
QList
<
QSharedPointer
<
FMItem
::
Pay
>
>
DBOP
::
GetPaysByOrder
Id
(
int
orderId
)
QList
<
QSharedPointer
<
FMItem
::
Pay
>
>
DBOP
::
GetPaysByOrder
DBId
(
int
orderDBID
)
{
QList
<
QSharedPointer
<
FMItem
::
Pay
>
>
payList
;
QSqlQuery
query
;
QString
condition
=
QString
(
"order
Id == '%1'"
).
arg
(
orderId
);
QString
condition
=
QString
(
"order
DBID == '%1'"
).
arg
(
orderDBID
);
Instance
()
->
_db
->
find
(
TABLE_PAY
,
query
,
QStringList
(),
condition
);
while
(
query
.
next
())
{
QSharedPointer
<
FMItem
::
Pay
>
payPointer
(
new
FMItem
::
Pay
());
...
...
fmvip/database/dbop.h
View file @
fa12d19d
...
...
@@ -28,12 +28,12 @@ public:
static
void
InsertTablePay
(
const
QString
&
transId
,
const
QString
&
fmId
,
const
QByteArray
&
reqData
,
const
QByteArray
&
rspData
);
static
void
InsertTableOrder
(
const
QString
&
transId
,
const
QString
&
fmId
,
const
QByteArray
&
reqData
,
const
QByteArray
&
rspData
);
static
void
GetOrderBy
TransId
(
const
QString
&
trans
Id
,
FMItem
::
Order
*
order
);
static
QSharedPointer
<
FMItem
::
Order
>
GetOrderBy
TransId
(
const
QString
&
trans
Id
);
static
void
GetOrderBy
OrderId
(
const
QString
&
order
Id
,
FMItem
::
Order
*
order
);
static
QSharedPointer
<
FMItem
::
Order
>
GetOrderBy
OrderId
(
const
QString
&
order
Id
);
static
void
GetOrderByDBId
(
unsigned
int
DBID
,
FMItem
::
Order
*
order
);
static
QSharedPointer
<
FMItem
::
Order
>
GetOrderByDBId
(
unsigned
int
DBID
);
static
QList
<
QSharedPointer
<
FMItem
::
Pay
>
>
GetPaysByOrder
Id
(
int
orderId
);
static
QList
<
QSharedPointer
<
FMItem
::
Pay
>
>
GetPaysByOrder
DBId
(
int
orderDBID
);
static
void
GetPayByDBId
(
unsigned
int
DBID
,
FMItem
::
Pay
*
pay
);
static
QSharedPointer
<
FMItem
::
Pay
>
GetPayByDBId
(
unsigned
int
DBID
);
...
...
fmvip/items/order.cpp
View file @
fa12d19d
...
...
@@ -7,8 +7,8 @@ using namespace FMItem;
Order
::
Order
(
QObject
*
parent
)
:
Item
(
parent
)
,
_
trans
Id
(
""
)
,
_fmId
(
""
)
,
_
order
Id
(
""
)
,
_fm
Order
Id
(
""
)
,
_orderAmount
(
0
)
,
_paidAmount
(
0
)
,
_undisAmount
(
0
)
...
...
@@ -25,24 +25,24 @@ Order::Order(QObject *parent)
}
QString
Order
::
trans
Id
()
const
QString
Order
::
order
Id
()
const
{
return
_
trans
Id
;
return
_
order
Id
;
}
void
Order
::
set
TransId
(
const
QString
&
trans
Id
)
void
Order
::
set
OrderId
(
const
QString
&
order
Id
)
{
_
transId
=
trans
Id
;
_
orderId
=
order
Id
;
}
QString
Order
::
fmId
()
const
QString
Order
::
fm
Order
Id
()
const
{
return
_fmId
;
return
_fm
Order
Id
;
}
void
Order
::
setFm
Id
(
const
QString
&
fm
Id
)
void
Order
::
setFm
OrderId
(
const
QString
&
fmOrder
Id
)
{
_fm
Id
=
fm
Id
;
_fm
OrderId
=
fmOrder
Id
;
}
int
Order
::
orderAmount
()
const
...
...
fmvip/items/order.h
View file @
fa12d19d
...
...
@@ -17,8 +17,8 @@ namespace FMItem {
{
Q_OBJECT
Q_PROPERTY
(
QString
trans_id
READ
transId
WRITE
setTrans
Id
)
Q_PROPERTY
(
QString
fm_
id
READ
fmId
WRITE
setFm
Id
)
Q_PROPERTY
(
QString
order_id
READ
orderId
WRITE
setOrder
Id
)
Q_PROPERTY
(
QString
fm_
order_id
READ
fmOrderId
WRITE
setFmOrder
Id
)
Q_PROPERTY
(
int
order_amount
READ
orderAmount
WRITE
setOrderAmount
)
Q_PROPERTY
(
int
paid_amount
READ
paidAmount
WRITE
setPaidAmount
)
Q_PROPERTY
(
int
undis_amount
READ
undisAmount
WRITE
setUndisAmount
)
...
...
@@ -34,11 +34,11 @@ namespace FMItem {
public:
explicit
Order
(
QObject
*
parent
=
0
);
QString
trans
Id
()
const
;
void
set
TransId
(
const
QString
&
trans
Id
);
QString
order
Id
()
const
;
void
set
OrderId
(
const
QString
&
order
Id
);
QString
fmId
()
const
;
void
setFm
Id
(
const
QString
&
fm
Id
);
QString
fm
Order
Id
()
const
;
void
setFm
OrderId
(
const
QString
&
fmOrder
Id
);
int
orderAmount
()
const
;
void
setOrderAmount
(
int
orderAmount
);
...
...
@@ -77,8 +77,8 @@ namespace FMItem {
void
setSettled
(
bool
settled
);
private
:
QString
_
trans
Id
;
QString
_fmId
;
QString
_
order
Id
;
QString
_fm
Order
Id
;
int
_orderAmount
;
int
_paidAmount
;
int
_undisAmount
;
...
...
fmvip/items/pay.cpp
View file @
fa12d19d
...
...
@@ -11,7 +11,7 @@ Pay::Pay(QObject *parent)
,
_disAmount
(
0
)
,
_account
(
""
)
,
_transId
(
""
)
,
_
pay
TransId
(
""
)
,
_
fm
TransId
(
""
)
{
}
...
...
@@ -71,24 +71,24 @@ void Pay::setTransId(const QString &transId)
_transId
=
transId
;
}
QString
Pay
::
pay
TransId
()
const
QString
Pay
::
fm
TransId
()
const
{
return
_
pay
TransId
;
return
_
fm
TransId
;
}
void
Pay
::
set
Pay
TransId
(
const
QString
&
payTransId
)
void
Pay
::
set
Fm
TransId
(
const
QString
&
payTransId
)
{
_
pay
TransId
=
payTransId
;
_
fm
TransId
=
payTransId
;
}
int
Pay
::
order
Id
()
const
int
Pay
::
order
DBID
()
const
{
return
_order
Id
;
return
_order
DBID
;
}
void
Pay
::
setOrder
Id
(
int
orderId
)
void
Pay
::
setOrder
DBID
(
int
orderId
)
{
_order
Id
=
orderId
;
_order
DBID
=
orderId
;
}
int
Pay
::
refundAmount
()
const
...
...
fmvip/items/pay.h
View file @
fa12d19d
...
...
@@ -13,11 +13,11 @@ namespace FMItem {
Q_PROPERTY
(
QString
pay_str
READ
payStr
WRITE
setPayStr
)
Q_PROPERTY
(
int
pay_amount
READ
payAmount
WRITE
setPayAmount
)
Q_PROPERTY
(
int
refund_amount
READ
refundAmount
WRITE
setRefundAmount
)
Q_PROPERTY
(
int
dis
count
_amount
READ
disAmount
WRITE
setDisAmount
)
Q_PROPERTY
(
int
dis_amount
READ
disAmount
WRITE
setDisAmount
)
Q_PROPERTY
(
QString
account
READ
account
WRITE
setAccount
)
Q_PROPERTY
(
QString
trans_id
READ
transId
WRITE
setTransId
)
Q_PROPERTY
(
QString
payTransId
READ
payTransId
WRITE
setPay
TransId
)
Q_PROPERTY
(
int
order
Id
READ
orderId
WRITE
setOrderId
)
Q_PROPERTY
(
QString
fmTransId
READ
fmTransId
WRITE
setFm
TransId
)
Q_PROPERTY
(
int
order
DBID
READ
orderDBID
WRITE
setOrderDBID
)
public
:
explicit
Pay
(
QObject
*
parent
=
0
);
...
...
@@ -39,11 +39,11 @@ namespace FMItem {
QString
transId
()
const
;
void
setTransId
(
const
QString
&
transId
);
QString
pay
TransId
()
const
;
void
set
PayTransId
(
const
QString
&
pay
TransId
);
QString
fm
TransId
()
const
;
void
set
FmTransId
(
const
QString
&
fm
TransId
);
int
order
Id
()
const
;
void
setOrder
Id
(
int
orderId
);
int
order
DBID
()
const
;
void
setOrder
DBID
(
int
orderDBID
);
int
refundAmount
()
const
;
void
setRefundAmount
(
int
refundAmount
);
...
...
@@ -57,9 +57,9 @@ namespace FMItem {
QString
_account
;
QString
_transId
;
QString
_
pay
TransId
;
QString
_
fm
TransId
;
int
_order
Id
;
int
_order
DBID
;
};
}
...
...
fmvip/task/taskfinal.cpp
View file @
fa12d19d
...
...
@@ -27,7 +27,7 @@ TaskFinal::~TaskFinal()
void
TaskFinal
::
packageServerReq
()
{
QString
transId
=
getPosJsonValue
(
PosProps
.
TransId
).
toString
();
DBOP
::
GetOrderBy
Trans
Id
(
transId
,
_order
);
DBOP
::
GetOrderBy
Order
Id
(
transId
,
_order
);
QStringList
keys
;
keys
<<
PosProps
.
OperatorId
<<
PosProps
.
PosId
<<
PosProps
.
StoreId
;
...
...
@@ -70,13 +70,13 @@ void TaskFinal::packageServerReq()
// Pays
QJsonArray
payArray
;
QList
<
QSharedPointer
<
FMItem
::
Pay
>
>
payList
=
DBOP
::
GetPaysByOrderId
(
_order
->
DBID
());
QList
<
QSharedPointer
<
FMItem
::
Pay
>
>
payList
=
DBOP
::
GetPaysByOrder
DB
Id
(
_order
->
DBID
());
if
(
_order
->
orderAmount
()
>
_order
->
paidAmount
())
{
QSharedPointer
<
FMItem
::
Pay
>
cashPay
(
new
FMItem
::
Pay
());
cashPay
->
setPayId
(
"0101"
);
cashPay
->
setPayAmount
(
_order
->
orderAmount
()
-
_order
->
paidAmount
());
cashPay
->
setTransId
(
_order
->
trans
Id
());
cashPay
->
setTransId
(
_order
->
order
Id
());
payList
.
append
(
cashPay
);
}
...
...
@@ -84,7 +84,7 @@ void TaskFinal::packageServerReq()
QJsonObject
payObj
;
payObj
[
ServerProps
(
PosProps
.
Amount
)]
=
it
->
data
()
->
payAmount
();
payObj
[
ServerProps
(
PosProps
.
TransId
)]
=
it
->
data
()
->
transId
();
payObj
[
"thirdPayTransId"
]
=
it
->
data
()
->
pay
TransId
();
payObj
[
"thirdPayTransId"
]
=
it
->
data
()
->
fm
TransId
();
QString
typeModeFlag
=
it
->
data
()
->
payId
();
if
(
typeModeFlag
==
"0101"
)
{
...
...
fmvip/task/taskpay.cpp
View file @
fa12d19d
...
...
@@ -172,7 +172,7 @@ void TaskPay::packagePOSRsp()
posRspJsonObj
[
PosProps
.
Fm_id
]
=
fmId
;
Order
*
order
=
new
Order
(
this
);
DBOP
::
GetOrderBy
Trans
Id
(
transId
,
order
);
DBOP
::
GetOrderBy
Order
Id
(
transId
,
order
);
// 如果订单是新的,则保存在数据库中
if
(
isOk
&&
order
->
isNew
())
{
order
->
SetPropertiesByJson
(
posReqJsonObj
);
...
...
@@ -208,9 +208,9 @@ void TaskPay::packagePOSRsp()
Pay
*
pay
=
new
Pay
(
this
);
pay
->
SetPropertiesByJson
(
pay_id
);
pay
->
setTransId
(
transId
);
pay
->
setOrder
Id
(
order
->
DBID
());
pay
->
setOrder
DBID
(
order
->
DBID
());
pay
->
setAccount
(
fm_open_id
);
pay
->
set
Pay
TransId
(
fmId
);
pay
->
set
Fm
TransId
(
fmId
);
DBOP
::
Save
(
pay
);
order
->
setPaidAmount
(
order
->
paidAmount
()
+
amount
);
DBOP
::
Save
(
order
);
...
...
fmvip/task/taskrefund.cpp
View file @
fa12d19d
...
...
@@ -31,7 +31,7 @@ void TaskRefund::setWindow()
session
()
->
addData
(
PosProps
.
TransId
,
transId
);
//! TODO 需要从其他数据库查询营业日、门店信息等。
auto
orderPointer
=
DBOP
::
GetOrderBy
Trans
Id
(
transId
);
auto
orderPointer
=
DBOP
::
GetOrderBy
Order
Id
(
transId
);
posReqJsonObj
=
orderPointer
->
toJson
(
QStringList
(),
posReqJsonObj
);
}
...
...
@@ -49,7 +49,7 @@ void TaskRefund::onRefundPay(int DBID)
posReqJsonObj
[
PosProps
.
TransId
]
=
session
()
->
data
(
PosProps
.
TransId
).
toString
();
QSharedPointer
<
FMItem
::
Pay
>
payPointer
=
DBOP
::
GetPayByDBId
(
DBID
);
QSharedPointer
<
FMItem
::
Order
>
orderPointer
=
DBOP
::
GetOrderByDBId
(
payPointer
->
order
Id
());
QSharedPointer
<
FMItem
::
Order
>
orderPointer
=
DBOP
::
GetOrderByDBId
(
payPointer
->
order
DBID
());
posReqJsonObj
=
orderPointer
->
toJson
(
QStringList
(),
posReqJsonObj
);
...
...
fmvip/windows/fmviprefund.cpp
View file @
fa12d19d
...
...
@@ -34,7 +34,7 @@ bool FMVipRefund::initWnd(Session *session)
ui
->
bd_label
->
setText
(
session
->
data
(
PosProps
.
BussinessDate
).
toString
());
QString
transId
=
session
->
data
(
PosProps
.
TransId
).
toString
();
DBOP
::
GetOrderBy
Trans
Id
(
transId
,
order
);
DBOP
::
GetOrderBy
Order
Id
(
transId
,
order
);
if
(
order
->
isNew
())
{
ui
->
textEdit_order
->
setText
(
QString
::
fromLocal8Bit
(
"未找到transId为 %1 的订单! "
).
arg
(
transId
));
...
...
@@ -44,13 +44,13 @@ bool FMVipRefund::initWnd(Session *session)
"订单总额:%3
\t
已付金额:%4
\n
"
"营业日:%5
\t
收银员:%6
\n
"
"门店号:%7
\t
POS号:%8
\n
"
)
.
arg
(
order
->
transId
()).
arg
(
order
->
fm
Id
())
.
arg
(
order
->
orderId
()).
arg
(
order
->
fmOrder
Id
())
.
arg
(
order
->
orderAmount
()
/
100.0
).
arg
(
order
->
paidAmount
()
/
100.0
)
.
arg
(
order
->
businessDate
()).
arg
(
order
->
operatorId
())
.
arg
(
order
->
storeId
()).
arg
(
order
->
posId
());
ui
->
textEdit_order
->
setText
(
orderInfo
);
pays
=
DBOP
::
GetPaysByOrderId
(
order
->
DBID
());
pays
=
DBOP
::
GetPaysByOrder
DB
Id
(
order
->
DBID
());
int
row
=
0
,
col
=
0
;
foreach
(
auto
payPointer
,
pays
)
{
...
...
tests/testitem/tst_testitem.cpp
View file @
fa12d19d
...
...
@@ -48,8 +48,8 @@ private slots:
void
test_DBSave_data
();
void
test_DBSave
();
void
test_GetOrderBy
Trans
Id_data
();
void
test_GetOrderBy
Trans
Id
();
void
test_GetOrderBy
Order
Id_data
();
void
test_GetOrderBy
Order
Id
();
void
test_GetTableLastItem_data
();
void
test_GetTableLastItem
();
...
...
@@ -72,12 +72,12 @@ void TestItem::initTestCase()
gPay
=
new
Pay
();
gProduct
=
new
Product
();
json1
[
"
trans
_id"
]
=
"11111"
;
json1
[
"fm_id"
]
=
"11111"
;
json1
[
"
order
_id"
]
=
"11111"
;
json1
[
"fm_
order_
id"
]
=
"11111"
;
json1
[
"order_amount"
]
=
100
;
json1
[
"canPay"
]
=
true
;
json2
[
"
trans
_id"
]
=
"22222"
;
json2
[
"
order
_id"
]
=
"22222"
;
json2
[
"canPay"
]
=
false
;
}
...
...
@@ -92,8 +92,8 @@ void TestItem::cleanupTestCase()
void
TestItem
::
test_SetPropertiesByJson_data
()
{
QTest
::
addColumn
<
QJsonObject
>
(
"json"
);
QTest
::
addColumn
<
QString
>
(
"
trans
Id"
);
QTest
::
addColumn
<
QString
>
(
"fmId"
);
QTest
::
addColumn
<
QString
>
(
"
order
Id"
);
QTest
::
addColumn
<
QString
>
(
"fm
Order
Id"
);
QTest
::
addColumn
<
int
>
(
"orderAmount"
);
QTest
::
addColumn
<
bool
>
(
"canPay"
);
...
...
@@ -119,8 +119,8 @@ void TestItem::test_SetPropertiesByJson_data()
void
TestItem
::
test_SetPropertiesByJson
()
{
QFETCH
(
QJsonObject
,
json
);
QFETCH
(
QString
,
trans
Id
);
QFETCH
(
QString
,
fmId
);
QFETCH
(
QString
,
order
Id
);
QFETCH
(
QString
,
fm
Order
Id
);
QFETCH
(
int
,
orderAmount
);
QFETCH
(
bool
,
canPay
);
// QFETCH(FMItem::ItemList, payList);
...
...
@@ -128,16 +128,16 @@ void TestItem::test_SetPropertiesByJson()
Order
order
;
order
.
SetPropertiesByJson
(
json
);
QCOMPARE
(
order
.
transId
(),
SearchJsonValue
(
json
,
"trans
_id"
).
toString
());
QCOMPARE
(
order
.
fm
Id
(),
SearchJsonValue
(
json
,
"fm
_id"
).
toString
());
QCOMPARE
(
order
.
orderId
(),
SearchJsonValue
(
json
,
"order
_id"
).
toString
());
QCOMPARE
(
order
.
fm
OrderId
(),
SearchJsonValue
(
json
,
"fm_order
_id"
).
toString
());
QCOMPARE
(
order
.
orderAmount
(),
SearchJsonValue
(
json
,
"order_amount"
).
toInt
());
QCOMPARE
(
order
.
property
(
"canPay"
).
toBool
(),
SearchJsonValue
(
json
,
"canPay"
).
toBool
());
// QCOMPARE(order.payList(), payList);
gOrder
->
SetPropertiesByJson
(
json
);
QCOMPARE
(
gOrder
->
transId
(),
trans
Id
);
QCOMPARE
(
gOrder
->
fm
Id
(),
fm
Id
);
QCOMPARE
(
gOrder
->
orderId
(),
order
Id
);
QCOMPARE
(
gOrder
->
fm
OrderId
(),
fmOrder
Id
);
QCOMPARE
(
gOrder
->
orderAmount
(),
orderAmount
);
QCOMPARE
(
gOrder
->
property
(
"canPay"
).
toBool
(),
canPay
);
// QCOMPARE(gOrder->payList(), payList);
...
...
@@ -155,11 +155,11 @@ void TestItem::test_PropertyNames_data()
itemPNames
<<
"objectName"
<<
"DBID"
;
QTest
::
newRow
(
"Item"
)
<<
gItem
<<
itemPNames
.
length
()
<<
itemPNames
;
orderPNames
<<
"objectName"
<<
"DBID"
<<
"
trans_id"
<<
"fm
_id"
<<
"order_amount"
<<
"paid_amount"
<<
"undis_amount"
orderPNames
<<
"objectName"
<<
"DBID"
<<
"
order_id"
<<
"fm_order
_id"
<<
"order_amount"
<<
"paid_amount"
<<
"undis_amount"
<<
"store_id"
<<
"pos_id"
<<
"operator_id"
<<
"business_date"
<<
"fm_open_id"
<<
"products"
<<
"settled"
;
QTest
::
newRow
(
"Order"
)
<<
qobject_cast
<
Item
*>
(
gOrder
)
<<
orderPNames
.
length
()
<<
orderPNames
;
payPNames
<<
"objectName"
<<
"DBID"
<<
"pay_id"
<<
"pay_str"
<<
"pay_amount"
<<
"refund_amount"
<<
"dis
count_amount"
<<
"account"
<<
"trans_id"
<<
"payTransId"
<<
"orderId
"
;
payPNames
<<
"objectName"
<<
"DBID"
<<
"pay_id"
<<
"pay_str"
<<
"pay_amount"
<<
"refund_amount"
<<
"dis
_amount"
<<
"account"
<<
"trans_id"
<<
"fmTransId"
<<
"orderDBID
"
;
QTest
::
newRow
(
"Pay"
)
<<
gPay
<<
payPNames
.
length
()
<<
payPNames
;
productPNames
<<
"objectName"
<<
"DBID"
<<
"id"
<<
"quantity"
<<
"price"
<<
"name"
;
...
...
@@ -190,8 +190,8 @@ void TestItem::test_DBSave_data()
QTest
::
newRow
(
"Pay"
)
<<
qobject_cast
<
Item
*>
(
pay
)
<<
true
;
QTest
::
newRow
(
"Order"
)
<<
qobject_cast
<
Item
*>
(
gOrder
)
<<
true
;
gOrder
->
setFmId
(
"11111"
);
gOrder
->
set
Trans
Id
(
"12345"
);
gOrder
->
setFm
Order
Id
(
"11111"
);
gOrder
->
set
Order
Id
(
"12345"
);
gOrder
->
setOrderAmount
(
1000
);
gOrder
->
setProductText
(
"{
\"
pid
\"
:
\"
1
\"
},{
\"
pid
\"
:
\"
2
\"
}"
);
QTest
::
newRow
(
"Order"
)
<<
qobject_cast
<
Item
*>
(
gOrder
)
<<
true
;
...
...
@@ -210,48 +210,47 @@ void TestItem::test_DBSave()
QVERIFY
(
item
->
DBID
()
>
0
);
}
void
TestItem
::
test_GetOrderBy
Trans
Id_data
()
void
TestItem
::
test_GetOrderBy
Order
Id_data
()
{
QTest
::
addColumn
<
Item
*>
(
"in_order"
);
QTest
::
addColumn
<
QString
>
(
"in_
trans
Id"
);
QTest
::
addColumn
<
QString
>
(
"in_
order
Id"
);
QTest
::
addColumn
<
Item
*>
(
"in_pay"
);
FMItem
::
Item
*
order
=
new
Order
();
order
->
SetPropertiesByJson
(
json1
);
qsrand
(
QDateTime
::
currentMSecsSinceEpoch
());
QString
trans
Id
=
QDateTime
::
currentDateTimeUtc
().
toString
(
"yyyyMMddhhmmsszzz"
)
+
QString
::
number
(
qrand
());
order
->
setProperty
(
"
trans_id"
,
trans
Id
);
QString
order
Id
=
QDateTime
::
currentDateTimeUtc
().
toString
(
"yyyyMMddhhmmsszzz"
)
+
QString
::
number
(
qrand
());
order
->
setProperty
(
"
order_id"
,
order
Id
);
FMItem
::
Item
*
pay
=
new
Pay
();
pay
->
setProperty
(
"trans_id"
,
transId
);
QTest
::
newRow
(
"Order1"
)
<<
order
<<
trans
Id
<<
pay
;
QTest
::
newRow
(
"Order1"
)
<<
order
<<
order
Id
<<
pay
;
}
void
TestItem
::
test_GetOrderBy
Trans
Id
()
void
TestItem
::
test_GetOrderBy
Order
Id
()
{
QFETCH
(
Item
*
,
in_order
);
QFETCH
(
QString
,
in_
trans
Id
);
QFETCH
(
QString
,
in_
order
Id
);
QFETCH
(
Item
*
,
in_pay
);
bool
isOk
=
DBOP
::
Save
(
in_order
);
QVERIFY2
(
isOk
,
"Save in_order failed."
);
in_pay
->
setProperty
(
"order
Id
"
,
in_order
->
DBID
());
in_pay
->
setProperty
(
"order
DBID
"
,
in_order
->
DBID
());
isOk
=
DBOP
::
Save
(
in_pay
);
QVERIFY2
(
isOk
,
"Save in_pay failed."
);
Order
*
order
=
new
Order
();
DBOP
::
GetOrderBy
TransId
(
in_trans
Id
,
order
);
DBOP
::
GetOrderBy
OrderId
(
in_order
Id
,
order
);
QVERIFY
(
order
->
isEqual
(
in_order
));
delete
order
;
QSharedPointer
<
Order
>
orderPointer
=
DBOP
::
GetOrderBy
TransId
(
in_trans
Id
);
QSharedPointer
<
Order
>
orderPointer
=
DBOP
::
GetOrderBy
OrderId
(
in_order
Id
);
QVERIFY
(
orderPointer
.
data
()
->
isEqual
(
in_order
));
QList
<
QSharedPointer
<
Pay
>
>
payList
;
payList
=
DBOP
::
GetPaysByOrderId
(
in_order
->
DBID
());
payList
=
DBOP
::
GetPaysByOrder
DB
Id
(
in_order
->
DBID
());
QVERIFY
(
payList
.
length
()
==
1
);
QVERIFY
(
payList
.
first
().
data
()
->
isEqual
(
in_pay
));
...
...
@@ -263,16 +262,20 @@ void TestItem::test_GetTableLastItem_data()
QTest
::
addColumn
<
Item
*>
(
"get_item"
);
Order
*
order
=
new
Order
(
this
);
Pay
*
pay
=
new
Pay
(
this
);
Order
*
order_save
=
new
Order
(
this
);
order_save
->
SetPropertiesByJson
(
json1
);
Order
*
order_get
=
new
Order
(
this
);
Pay
*
pay_save
=
new
Pay
(
this
);
pay_save
->
SetPropertiesByJson
(
json1
);
Pay
*
pay_get
=
new
Pay
(
this
);
StoreInfo
*
si_save
=
new
StoreInfo
(
this
);
si_save
->
setStoreId
(
"fm9999"
);
si_save
->
setPosId
(
"2"
);
si_save
->
setBusinessDate
(
"2017"
);
si_save
->
setOperatorId
(
"001"
);
StoreInfo
*
si_get
=
new
StoreInfo
(
this
);
QTest
::
newRow
(
"Order"
)
<<
qobject_cast
<
Item
*>
(
gOrder
)
<<
qobject_cast
<
Item
*>
(
order
);
QTest
::
newRow
(
"Pay"
)
<<
qobject_cast
<
Item
*>
(
gPay
)
<<
qobject_cast
<
Item
*>
(
pay
);
QTest
::
newRow
(
"Order"
)
<<
qobject_cast
<
Item
*>
(
order_save
)
<<
qobject_cast
<
Item
*>
(
order_get
);
QTest
::
newRow
(
"Pay"
)
<<
qobject_cast
<
Item
*>
(
pay_save
)
<<
qobject_cast
<
Item
*>
(
pay_get
);
QTest
::
newRow
(
"StoreInfo"
)
<<
qobject_cast
<
Item
*>
(
si_save
)
<<
qobject_cast
<
Item
*>
(
si_get
);
}
...
...
tests/testplugin/tst_testplugin.cpp
View file @
fa12d19d
...
...
@@ -46,12 +46,12 @@ void TestPlugin::test_dotask_data()
{
QTest
::
addColumn
<
QByteArray
>
(
"reqData"
);
QTest
::
newRow
(
"Refund"
)
<<
QByteArray
(
"{
\"
fm_cmd
\"
: 1004,
\"
trans_id
\"
:
\"
12345
\"
}"
);
QTest
::
newRow
(
"Refund not"
)
<<
QByteArray
(
"{
\"
fm_cmd
\"
: 1004,
\"
trans_id
\"
:
\"
123456
\"
}"
);
QTest
::
newRow
(
"SetStoreInfo"
)
<<
QByteArray
(
"{
\"
fm_cmd
\"
: 1000,
\"
store_id
\"
:
\"
fm9999
\"
,
\"
pos_id
\"
:
\"
1
\"
,
\"
business_date
\"
:
\"
20171016
\"
,
\"
operator_id
\"
:
\"
001
\"
}"
);
QTest
::
newRow
(
"SetStoreInfo_need_posId"
)
<<
QByteArray
(
"{
\"
fm_cmd
\"
: 1000,
\"
store_id
\"
:
\"
fm9999
\"
,
\"
pos_id
\"
:
\"\"
,
\"
business_date
\"
:
\"
20171016
\"
,
\"
operator_id
\"
:
\"
001
\"
}"
);
QTest
::
newRow
(
"SetStoreInfo_notnull_posId"
)
<<
QByteArray
(
"{
\"
fm_cmd
\"
: 1000,
\"
store_id
\"
:
\"
fm9999
\"
,
\"
business_date
\"
:
\"
20171016
\"
,
\"
operator_id
\"
:
\"
001
\"
}"
);
QTest
::
newRow
(
"SetStoreInfo_error_type"
)
<<
QByteArray
(
"{
\"
fm_cmd
\"
: 1000,
\"
store_id
\"
:
\"
fm9999
\"
,
\"
pos_id
\"
: 1,
\"
business_date
\"
:
\"
20171016
\"
,
\"
operator_id
\"
:
\"
001
\"
}"
);
//
QTest::newRow("Refund") << QByteArray("{\"fm_cmd\": 1004,\"trans_id\": \"12345\"}");
//
QTest::newRow("Refund not") << QByteArray("{\"fm_cmd\": 1004,\"trans_id\": \"123456\"}");
//
QTest::newRow("SetStoreInfo") << QByteArray("{\"fm_cmd\": 1000,\"store_id\": \"fm9999\",\"pos_id\": \"1\",\"business_date\": \"20171016\",\"operator_id\": \"001\"}");
//
QTest::newRow("SetStoreInfo_need_posId") << QByteArray("{\"fm_cmd\": 1000,\"store_id\": \"fm9999\",\"pos_id\": \"\",\"business_date\": \"20171016\",\"operator_id\": \"001\"}");
//
QTest::newRow("SetStoreInfo_notnull_posId") << QByteArray("{\"fm_cmd\": 1000,\"store_id\": \"fm9999\",\"business_date\": \"20171016\",\"operator_id\": \"001\"}");
//
QTest::newRow("SetStoreInfo_error_type") << QByteArray("{\"fm_cmd\": 1000,\"store_id\": \"fm9999\",\"pos_id\": 1,\"business_date\": \"20171016\",\"operator_id\": \"001\"}");
QTest
::
newRow
(
"Login"
)
<<
QByteArray
(
"{
\"
fm_cmd
\"
: 1001,
\"
member_sign
\"
:
\"
12345
\"
}"
);
}
...
...
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