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
zhenfei.zhang
fmp_vip
Commits
a77fbb94
Commit
a77fbb94
authored
Jan 31, 2018
by
NitefullWind
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 实现订单结算。
parent
26d61fae
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
6 deletions
+19
-6
fmvip/task/taskfinal.cpp
+0
-0
fmvip/task/taskfinal.h
+2
-5
tests/autotest/tst_db_query.h
+16
-0
version.h
+1
-1
No files found.
fmvip/task/taskfinal.cpp
View file @
a77fbb94
This diff is collapsed.
Click to expand it.
fmvip/task/taskfinal.h
View file @
a77fbb94
#ifndef TASKFINAL_H
#ifndef TASKFINAL_H
#define TASKFINAL_H
#define TASKFINAL_H
#include "fmtasknownd.h"
#include "fmtasknownd.h"
#include "database.h"
//namespace FMItem {
//class Order;
//}
class
TaskFinal
:
public
FMTaskNoWnd
class
TaskFinal
:
public
FMTaskNoWnd
{
{
...
@@ -21,7 +18,7 @@ public:
...
@@ -21,7 +18,7 @@ public:
private
:
private
:
QString
backup
();
QString
backup
();
// FMItem::Order *
_order;
QSharedPointer
<
DB
::
Order
>
_order
;
bool
isUseVipPay
;
bool
isUseVipPay
;
};
};
...
...
tests/autotest/tst_db_query.h
View file @
a77fbb94
...
@@ -26,6 +26,22 @@ protected:
...
@@ -26,6 +26,22 @@ protected:
}
}
};
};
TEST_F
(
TestDBQuery
,
Load
)
{
try
{
transaction
t
(
DBSP
()
->
begin
());
QSharedPointer
<
Order
>
order
=
DBSP
()
->
load
<
Order
>
(
1
);
EXPECT_NE
(
order
,
nullptr
);
order
->
storeInfo
().
load
();
EXPECT_EQ
(
order
->
storeInfo
()
->
storeId
(),
"fm9999"
);
}
catch
(
const
odb
::
exception
&
e
)
{
FAIL
()
<<
"Exception: "
<<
e
.
what
();
}
}
TEST_F
(
TestDBQuery
,
Query
)
TEST_F
(
TestDBQuery
,
Query
)
{
{
...
...
version.h
View file @
a77fbb94
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
#define VER_MINOR 1
#define VER_MINOR 1
#define VER_REVISION 0
#define VER_REVISION 0
#define VER_BUILD 4
2
#define VER_BUILD 4
3
//! Convert version numbers to string
//! Convert version numbers to string
#define _STR(S) #S
#define _STR(S) #S
...
...
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