带处理不展示退款按钮

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

@@ -4396,16 +4396,28 @@ public class OrderAdapter {
         //校验有没有售后单,一笔订单只会存在一笔售后单,售后单展示为取消展示申请退款按钮
         AfterSalesOrderResp afterSalesOrderResp = orderBean.getAfterSalesOrderResp();
         List<Integer> orderStatusList = Arrays.asList(OrderStatus.WAIT_PAY.getCode(),OrderStatus.RECEIPT.getCode(),OrderStatus.DISTRIBUTION.getCode(),OrderStatus.COMPLETE.getCode());
-        List<Integer> afterSaleStatusList = Arrays.asList(AfterSalesStatus.PENDING.getIndex());
-
-        if(orderStatusList.contains(orderBean.getStatus()) && (null == afterSalesOrderResp || (null !=afterSalesOrderResp &&  AfterSalesStatus.CANCEL.getIndex() == afterSalesOrderResp.getAfterSalesStatus()))){
-            refundButtonDisable = true;
-        }
-        if(null == orderBean.getAfterSalesOrderResp() && null != orderBean.getGmtDelivery() && (DateUtil.addDays(new Date(orderBean.getGmtDelivery()),30)).compareTo(new Date()) == -1){
-            refundButtonDisable = false;
-        }
-        if(null != orderBean.getAfterSalesOrderResp() &&  afterSaleStatusList.contains( orderBean.getAfterSalesOrderResp().getAfterSalesStatus())){
-            refundButtonDisable = false;
+        List<Integer> afterSaleStatusList = Arrays.asList(AfterSalesStatus.PENDING.getIndex(),AfterSalesStatus.COMPLETE.getIndex(),AfterSalesStatus.REJECTED.getIndex());
+        //已发货
+        if(null !=  orderBean.getGmtDelivery()){
+            if(orderStatusList.contains(orderBean.getStatus()) && (null == afterSalesOrderResp || (null !=afterSalesOrderResp &&  AfterSalesStatus.CANCEL.getIndex() == afterSalesOrderResp.getAfterSalesStatus()))){
+                refundButtonDisable = true;
+            }
+            if(null == orderBean.getAfterSalesOrderResp() && null != orderBean.getGmtDelivery() && (DateUtil.addDays(new Date(orderBean.getGmtDelivery()),30)).compareTo(new Date()) == -1){
+                refundButtonDisable = false;
+            }
+            if(null != orderBean.getAfterSalesOrderResp() &&  afterSaleStatusList.contains( orderBean.getAfterSalesOrderResp().getAfterSalesStatus())){
+                refundButtonDisable = false;
+            }
+        }else{
+            if(orderStatusList.contains(orderBean.getStatus()) && (null == afterSalesOrderResp || (null !=afterSalesOrderResp &&  AfterSalesStatus.CANCEL.getIndex() == afterSalesOrderResp.getAfterSalesStatus()))){
+                refundButtonDisable = true;
+            }
+            if(null == orderBean.getAfterSalesOrderResp()){
+                refundButtonDisable = false;
+            }
+            if(null != orderBean.getAfterSalesOrderResp() &&  afterSaleStatusList.contains( orderBean.getAfterSalesOrderResp().getAfterSalesStatus())){
+                refundButtonDisable = false;
+            }
         }
         return refundButtonDisable;
     }