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

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

@@ -1183,6 +1183,7 @@ public class OrderAdapter {
             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));
 
                         QueryOrdersResponse.DataBean.OrderBean.RefundBean latestRefundBean = ordersBean.getRefundList().get(0);
                         for(int i=0;i<ordersBean.getRefundList().size();i++) {

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -272,6 +272,10 @@ public class QueryOrderResponseVo {
      * 订单是否可再次申请退款  必须经过规定的间隔时间才可以再次申请
      */
     private Boolean afterRefundInterval = false;
+    /**
+     * 订单是否可再次申请退款  必须经过规定的间隔时间才可以再次申请
+     */
+    private Long refundIntervalTime = 0l;
 
 
     private List<ProductVo> products;