Merge branch 'feature/20210526-拼团订单顶部状态-张志恒'

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

@@ -1501,6 +1501,7 @@ public class OrderAdapter {
             }
             //是否展示申请退款按钮 true 展示 false 不展示
             responseVo.setRefundButtonDisable(getRefundButtonDisable(ordersBean));
+            responseVo.setOrderCompareAfterSaleOrder(getOrderCompareAfterSaleOrder(ordersBean));
             responseVo.setExpressChannelCode(ordersBean.getExpressChannelCode());
             responseVo.setExpressChannelName(ordersBean.getExpressChannelName());
             responseVo.setExpressNo(ordersBean.getExpressNo());
@@ -4410,10 +4411,10 @@ 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(),AfterSalesStatus.RETURNING.getIndex(),AfterSalesStatus.GOODS_RETURNED.getIndex(),AfterSalesStatus.COMPLETE.getIndex());
+        List<Integer> afterSaleStatusList = Arrays.asList(AfterSalesStatus.PENDING.getIndex(),AfterSalesStatus.RETURNING.getIndex(),AfterSalesStatus.GOODS_RETURNED.getIndex(),AfterSalesStatus.REJECTED.getIndex(),AfterSalesStatus.COMPLETE.getIndex());
         //已发货
         if(null !=  orderBean.getGmtDelivery()){
-            if(orderStatusList.contains(orderBean.getStatus()) && (null == afterSalesOrderResp || (null !=afterSalesOrderResp &&  AfterSalesStatus.CANCEL.getIndex() == afterSalesOrderResp.getAfterSalesStatus()))){
+            if(orderStatusList.contains(orderBean.getStatus()) && (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){
@@ -4427,7 +4428,7 @@ public class OrderAdapter {
             }
         }else{
             List<Integer> noDeliveryAfterSalesStatus = Arrays.asList(AfterSalesStatus.PENDING.getIndex(),AfterSalesStatus.COMPLETE.getIndex());
-            if(orderStatusList.contains(orderBean.getStatus()) && (null == afterSalesOrderResp || (null !=afterSalesOrderResp &&  AfterSalesStatus.CANCEL.getIndex() == afterSalesOrderResp.getAfterSalesStatus()))){
+            if(orderStatusList.contains(orderBean.getStatus()) && (null == afterSalesOrderResp || (AfterSalesStatus.CANCEL.getIndex() == afterSalesOrderResp.getAfterSalesStatus()))){
                 refundButtonDisable = true;
             }
             if(null != orderBean.getAfterSalesOrderResp() &&  noDeliveryAfterSalesStatus.contains( orderBean.getAfterSalesOrderResp().getAfterSalesStatus())){
@@ -4436,4 +4437,16 @@ public class OrderAdapter {
         }
         return refundButtonDisable;
     }
+
+    private boolean getOrderCompareAfterSaleOrder(QueryOrdersResponse.DataBean.OrderBean orderBean){
+        boolean orderCompareAfterSaleOrder = false;
+        List<Integer> orderStatusList = Arrays.asList(OrderStatus.RECEIPT.getCode(),OrderStatus.DISTRIBUTION.getCode(),OrderStatus.COMPLETE.getCode());
+        //是否忽略售后单状态”呀，大部分情况都是false；只有拒绝退款后继续发货状态并行时新赠的“是否忽略售后单状态”字段为true
+        AfterSalesOrderResp afterSalesOrderResp = orderBean.getAfterSalesOrderResp();
+        if(null != afterSalesOrderResp && ((Objects.equals(AfterSalesStatus.CANCEL.getIndex(),afterSalesOrderResp.getAfterSalesStatus()) && Objects.equals(OrderStatus.DISTRIBUTION.getCode(),orderBean.getStatus())) ||
+                (Objects.equals(AfterSalesStatus.REJECTED.getIndex(),afterSalesOrderResp.getAfterSalesStatus()) && (orderStatusList.contains(orderBean.getStatus()))))) {
+            orderCompareAfterSaleOrder = true;
+        }
+        return orderCompareAfterSaleOrder;
+    }
 }

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

@@ -635,5 +635,9 @@ public class QueryOrderResponseVo {
      */
     private boolean refundButtonDisable;
 
+    /**
+     * 是否展示申请退款按钮
+     */
+    private boolean orderCompareAfterSaleOrder;
 
 }