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

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

@@ -1210,7 +1210,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));
 
@@ -1234,14 +1233,7 @@ public class OrderAdapter {
                         }
                     }
 
-                        if(StringUtils.isNotBlank(responseVo.getRid())) {
-                            responseVo.setRid(latestRefundBean.getRid());
-                            responseVo.setRefundStatus(latestRefundBean.getStatus());
-                            responseVo.setRefundStatusDesc(Optional.ofNullable(RefundStatus.getByCode(latestRefundBean.getStatus()))
-                                    .map(RefundStatus::getDesc).orElse(""));
-                            responseVo.setRefundReason(latestRefundBean.getReason());
-                            String refundCreateTime = DateUtil.convert2String(new Date(Long.parseLong(latestRefundBean.getCreateTime())),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
-                            responseVo.setRefundCreateTime(refundCreateTime);
+                    if(StringUtils.isBlank(responseVo.getRid())) {
                         if(new Date().getTime() - Long.parseLong(latestRefundBean.getCreateTime()) > Long.valueOf(mccafeRefundInterval)) {
                             responseVo.setAfterRefundInterval(true);
                         }
@@ -1257,7 +1249,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);