Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmPOS
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
fmPOS
Commits
b1ad9a9c
Commit
b1ad9a9c
authored
Aug 23, 2017
by
gujin.wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
为订单管理添加查看每笔支付的详情功能。
parent
1be029b4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
3 deletions
+6
-3
debug/plugins/fmp_test.db
+0
-0
fmp_epay
+1
-1
fmp_redeem/fmp_redeem.cpp
+5
-2
release/plugins/fmp_test.db
+0
-0
No files found.
debug/plugins/fmp_test.db
View file @
b1ad9a9c
No preview for this file type
fmp_epay
@
868048a7
Subproject commit
30a8ed65198847106c3218cb6d103dd8558e7e25
Subproject commit
868048a7f72e86ed42cb700d87ea7374f9678a9a
fmp_redeem/fmp_redeem.cpp
View file @
b1ad9a9c
...
@@ -316,12 +316,15 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json)
...
@@ -316,12 +316,15 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json)
if
(
couponType
==
0
)
//商品券
if
(
couponType
==
0
)
//商品券
{
{
redeemResult
[
"discount"
]
=
SearchJsonObject
(
json
,
"paid"
).
toInt
()
/
100
;
redeemResult
[
"discount"
]
=
SearchJsonObject
(
json
,
"paid"
).
toInt
();
redeemResult
[
"pid"
]
=
SearchJsonObject
(
json
,
"pid"
).
toString
();
}
}
else
if
(
couponType
==
1
)
//代金券
else
if
(
couponType
==
1
)
//代金券
{
{
redeemResult
[
"discount"
]
=
SearchJsonObject
(
json
,
"amount"
).
toInt
()
/
100
;
redeemResult
[
"discount"
]
=
SearchJsonObject
(
json
,
"amount"
).
toInt
();
}
}
redeemResult
[
"couponType"
]
=
act_name
;
redeemResult
[
"code"
]
=
coupon
;
}
}
break
;
break
;
default
:
default
:
...
...
release/plugins/fmp_test.db
View file @
b1ad9a9c
No preview for this file type
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