拼团订单头部按钮

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

@@ -4439,7 +4439,7 @@ public class OrderAdapter {
         boolean orderCompareAfterSaleOrder = false;
         //是否忽略售后单状态”呀，大部分情况都是false；只有拒绝退款后继续发货状态并行时新赠的“是否忽略售后单状态”字段为true
         AfterSalesOrderResp afterSalesOrderResp = orderBean.getAfterSalesOrderResp();
-        if(null != afterSalesOrderResp && Objects.equals(AfterSalesStatus.REJECTED.getIndex(),afterSalesOrderResp.getAfterSalesStatus()) && (Objects.equals(AfterSalesStatus.CANCEL.getIndex(),afterSalesOrderResp.getAfterSalesStatus()) |Objects.equals(OrderStatus.RECEIPT.getCode(),orderBean.getStatus()) || Objects.equals(OrderStatus.DISTRIBUTION.getCode(),orderBean.getStatus()) || Objects.equals(OrderStatus.COMPLETE.getCode(),orderBean.getStatus()))){
+        if(null != afterSalesOrderResp && (Objects.equals(AfterSalesStatus.CANCEL.getIndex(),afterSalesOrderResp.getAfterSalesStatus()) && Objects.equals(OrderStatus.DISTRIBUTION.getCode(),orderBean.getStatus()) ) || (Objects.equals(AfterSalesStatus.REJECTED.getIndex(),afterSalesOrderResp.getAfterSalesStatus()) && (Objects.equals(OrderStatus.RECEIPT.getCode(),orderBean.getStatus()) || Objects.equals(OrderStatus.DISTRIBUTION.getCode(),orderBean.getStatus()) || Objects.equals(OrderStatus.COMPLETE.getCode(),orderBean.getStatus())))){
             orderCompareAfterSaleOrder = true;
         }
         return orderCompareAfterSaleOrder;