ufo / yohoufo-fore · Commits

Go to a project

Authored by tanling
Commit 0368b8802032ce357a4e9a2f842f72dcf0f12d02 1 parent 6237c5d5

leftTime

Inline Side-by-side
Showing 3 changed files with 8 additions and 3 deletions
@@ -141,7 +141,12 @@ public abstract class AbsOrderViewService { @@ -141,7 +141,12 @@ public abstract class AbsOrderViewService {
141 } 141 }
142 142
143 protected int calLeftTime(int timeout, int creatTime){ 143 protected int calLeftTime(int timeout, int creatTime){
144 - return timeout - (DateUtil.getCurrentTimeSecond() - creatTime); 144 + int payExpire = timeout - (DateUtil.getCurrentTimeSecond() - creatTime);
  145 + if (payExpire < 0){
  146 + payExpire = 0;
  147 + }
  148 +
  149 + return payExpire;
145 } 150 }
146 151
147 protected void setPayment(OrderDetailInfo orderDetailInfo, Integer paymentCode){ 152 protected void setPayment(OrderDetailInfo orderDetailInfo, Integer paymentCode){
@@ -59,7 +59,7 @@ datasources: @@ -59,7 +59,7 @@ datasources:
59 - com.yohoufo.dal.order.StoredSellerMapper 59 - com.yohoufo.dal.order.StoredSellerMapper
60 - com.yohoufo.dal.order.SuperEntrySellerMapper 60 - com.yohoufo.dal.order.SuperEntrySellerMapper
61 - com.yohoufo.dal.order.QiniuLiveRecordMapper 61 - com.yohoufo.dal.order.QiniuLiveRecordMapper
62 - - com.yoho.yhorder.dal.IOrdersPrePayDao 62 + - com.yohoufo.dal.order.OrdersPrePayMapper
63 63
64 ufo_promotion: 64 ufo_promotion:
65 servers: 65 servers:
@@ -59,7 +59,7 @@ datasources: @@ -59,7 +59,7 @@ datasources:
59 - com.yohoufo.dal.order.StoredSellerMapper 59 - com.yohoufo.dal.order.StoredSellerMapper
60 - com.yohoufo.dal.order.SuperEntrySellerMapper 60 - com.yohoufo.dal.order.SuperEntrySellerMapper
61 - com.yohoufo.dal.order.QiniuLiveRecordMapper 61 - com.yohoufo.dal.order.QiniuLiveRecordMapper
62 - - com.yoho.yhorder.dal.IOrdersPrePayDao 62 + - com.yohoufo.dal.order.OrdersPrePayMapper
63 63
64 ufo_promotion: 64 ufo_promotion:
65 servers: 65 servers: