Merge branch 'feature/20201015_麦咖啡允许重复申请退款_xukang' into qa

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1196,7 +1196,6 @@ public class OrderAdapter {
             }
             if (ordersBean.getHasRefund() != null && ordersBean.getHasRefund() && CollectionUtils.isNotEmpty(ordersBean.getRefundList())) {
                 if(mcCafePartnerId.equals(ordersBean.getCompanyId())) {
-                    responseVo.setRefundIntervalTime(Long.valueOf(mccafeRefundInterval));
 
                     QueryOrdersResponse.DataBean.OrderBean.RefundBean latestRefundBean = ordersBean.getRefundList().get(0);
                     for(int i=0;i<ordersBean.getRefundList().size();i++) {
@@ -1222,6 +1221,7 @@ public class OrderAdapter {
                         if(new Date().getTime() - Long.parseLong(latestRefundBean.getCreateTime()) > Long.valueOf(mccafeRefundInterval)) {
                             responseVo.setAfterRefundInterval(true);
                         }
+                        responseVo.setRefundIntervalTime(Long.valueOf(latestRefundBean.getCreateTime()) + Long.valueOf(mccafeRefundInterval));
                     }
 
                 } else {