记得上下班打卡 | git大法好,push需谨慎

Commit e0bd4641 authored by 胡佳晨's avatar 胡佳晨

正在下单活动 订单自动关闭时间1分钟

parent d7799324
...@@ -455,9 +455,13 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService { ...@@ -455,9 +455,13 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
//获取 订单剩余可支付时间[S] //获取 订单剩余可支付时间[S]
private long getRestTime(GoblinStoreOrderVo orderVo) { private long getRestTime(GoblinStoreOrderVo orderVo) {
long restTime = 0L; long restTime = 0L;
int time = orderVo.getPayCountdownMinute();
if (orderVo.getMarketType().equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())) {
time = 0;
}
if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_0.getValue()) { if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_0.getValue()) {
try { try {
Date OverdueAt = DateUtil.addMin(DateUtil.parse(orderVo.getCreatedAt(), "yyyy-MM-dd HH:mm:ss"), orderVo.getPayCountdownMinute()); Date OverdueAt = DateUtil.addMin(DateUtil.parse(orderVo.getCreatedAt(), "yyyy-MM-dd HH:mm:ss"), time);
restTime = DateUtil.intervalSeconds( restTime = DateUtil.intervalSeconds(
OverdueAt, OverdueAt,
DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss") DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
......
...@@ -360,7 +360,11 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -360,7 +360,11 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
storeOrder.setIsMember(isMember ? 1 : 0); storeOrder.setIsMember(isMember ? 1 : 0);
storeOrder.setOrderType(0); storeOrder.setOrderType(0);
storeOrder.setWriteOffCode(writeOffCode); storeOrder.setWriteOffCode(writeOffCode);
storeOrder.setPayCountdownMinute(5); if (marketType.equals(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())) {
storeOrder.setPayCountdownMinute(1);
} else {
storeOrder.setPayCountdownMinute(5);
}
storeOrder.setIpAddress(CurrentUtil.getCliIpAddr()); storeOrder.setIpAddress(CurrentUtil.getCliIpAddr());
storeOrder.setCreatedAt(now); storeOrder.setCreatedAt(now);
storeOrder.setMarketId(marketId); storeOrder.setMarketId(marketId);
......
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