Commit 49e7499b authored by zhang_z's avatar zhang_z

会员保护;

parent 3ba13f26
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment