订单多次申请退款

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

@@ -1156,7 +1156,6 @@ public class OrderAdapter {
                 responseVo.setModifiedTime(DateUtil.convert2String(new Date(ordersBean.getGmtModified()), "yyyy-MM-dd HH:mm:ss"));
             }
             if (ordersBean.getHasRefund() != null && ordersBean.getHasRefund() && CollectionUtils.isNotEmpty(ordersBean.getRefundList())) {
-                if (CollectionUtils.isNotEmpty(ordersBean.getRefundList())) {
                 if(mcCafePartnerId.equals(ordersBean.getCompanyId())) {
                     responseVo.setRefundIntervalTime(Long.valueOf(mccafeRefundInterval));
 
@@ -1203,7 +1202,14 @@ public class OrderAdapter {
                     String refundCreateTime = DateUtil.convert2String(new Date(Long.parseLong(refundBean.getCreateTime())),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
                     responseVo.setRefundCreateTime(refundCreateTime);
                 }
+            } else {
+                responseVo.setAfterRefundInterval(true);
             }
+            //如果是已取消、拒单、已完成的订单，则设置不能申请取消订单
+            if(OrderStatus.REFUSE.getCode().equals(ordersBean.getStatus())
+                    || OrderStatus.CALCEL.getCode().equals(ordersBean.getStatus())
+                    || OrderStatus.COMPLETE.getCode().equals(ordersBean.getStatus())) {
+                responseVo.setAfterRefundInterval(false);
             }
             //商品信息转换
             convent2ProductVos(ordersBean.getProductList(), responseVo);