Commit 25d7a4c1 by 徐康

bugfix

parent a596fad0
...@@ -1173,8 +1173,7 @@ public class OrderAdapter { ...@@ -1173,8 +1173,7 @@ public class OrderAdapter {
responseVo.setRefundCreateTime(refundCreateTime); responseVo.setRefundCreateTime(refundCreateTime);
break; break;
} else { } else {
if(DateUtil.convert2Date(refundBean.getCreateTime(), "yyyy-MM-dd HH:mm:ss") if(new Date(Long.valueOf(refundBean.getCreateTime())).after(new Date(Long.valueOf(latestRefundBean.getCreateTime())))) {
.after(DateUtil.convert2Date(latestRefundBean.getCreateTime(), "yyyy-MM-dd HH:mm:ss"))) {
latestRefundBean = refundBean; latestRefundBean = refundBean;
} }
} }
......
...@@ -1083,8 +1083,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1083,8 +1083,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
if (RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) { if (RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "商家正在处理中,请稍后……"); return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "商家正在处理中,请稍后……");
} }
if(new Date().getTime() - DateUtil.convert2Date(refundBean.getCreateTime(), "yyyy-MM-dd HH:mm:ss").getTime() if(new Date().getTime() - Long.valueOf(refundBean.getCreateTime()) < Long.valueOf(mccafeRefundInterval)) {
< Long.valueOf(mccafeRefundInterval)) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "退款请求太频繁,请稍后再试"); return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "退款请求太频繁,请稍后再试");
} }
} }
......
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