Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TangKuPos
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王海
TangKuPos
Commits
49e7499b
Commit
49e7499b
authored
Mar 20, 2018
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员保护;
parent
3ba13f26
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java
app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java
+4
-2
No files found.
app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java
View file @
49e7499b
...
...
@@ -390,7 +390,9 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
this
.
orderPayAmt
-=
this
.
msDisAmt
;
//优惠券
if
(
ticket
!=
null
&&
ticket
.
getTruleOrderAmt
()
>
getOrderPayAmt
())
this
.
ticket
=
null
;
if
(
ticket
!=
null
&&
(
ticket
.
getTruleOrderAmt
()
>
getOrderPayAmt
()
||
ticket
.
getTicketNo
()
==
-
1
))
{
this
.
ticket
=
null
;
}
this
.
ticketId
=
ticket
==
null
?
-
1L
:
ticket
.
getId
();
this
.
ticketAmt
=
ticket
==
null
?
0L
:
ticket
.
getTicketValAmt
();
this
.
ticketNum
=
ticket
==
null
?
(
byte
)
0
:
(
byte
)
1
;
...
...
@@ -1009,7 +1011,7 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
@Override
public
String
getDRAW_URL
()
{
return
"http://tk.demo.xingdata.com/wx/jump.html?sid="
+
LoginPresenter
.
loginReturnBean
.
getShopMapId
()
;
return
"http://tk.demo.xingdata.com/wx/jump.html?sid="
+
LoginPresenter
.
loginReturnBean
.
getShopMapId
();
}
@Override
...
...
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