Commit 5c6c06db by 徐康

bugfix

parent d6225a07
......@@ -1198,16 +1198,9 @@ public class OrderAdapter {
responseVo.setRefundCreateTime(refundCreateTime);
break;
} else {
try {
if(DateUtil.convert2Date(refundBean.getCreateTime(), "yyyy-MM-dd HH:mm:ss")
.after(DateUtil.convert2Date(latestRefundBean.getCreateTime(), "yyyy-MM-dd HH:mm:ss"))) {
if(new Date(Long.valueOf(refundBean.getCreateTime())).after(new Date(Long.valueOf(latestRefundBean.getCreateTime())))) {
latestRefundBean = refundBean;
}
} catch (Exception e) {
System.out.println("===============================================================================================");
System.out.println(JSON.toJSONString(ordersBean));
System.out.println("===============================================================================================");
}
}
}
......
......@@ -1082,8 +1082,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
if (RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "商家正在处理中,请稍后……");
}
if(new Date().getTime() - DateUtil.convert2Date(refundBean.getCreateTime(), "yyyy-MM-dd HH:mm:ss").getTime()
< Long.valueOf(mccafeRefundInterval)) {
if(new Date().getTime() - Long.valueOf(refundBean.getCreateTime()) < Long.valueOf(mccafeRefundInterval)) {
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