拼团订单定出处理逻辑

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());
@@ -4433,4 +4434,19 @@ public class OrderAdapter {
         }
         return refundButtonDisable;
     }
+
+    private boolean getOrderCompareAfterSaleOrder(QueryOrdersResponse.DataBean.OrderBean orderBean){
+        boolean orderCompareAfterSaleOrder = false;
+        //是否忽略售后单状态”呀，大部分情况都是false；只有拒绝退款后继续发货状态并行时新赠的“是否忽略售后单状态”字段为true
+        AfterSalesOrderResp afterSalesOrderResp = orderBean.getAfterSalesOrderResp();
+        //已发货
+        if(null != afterSalesOrderResp && Objects.equals(AfterSalesStatus.REJECTED.getIndex(),afterSalesOrderResp.getAfterSalesStatus()) && Objects.equals(OrderStatus.DISTRIBUTION.getCode(),orderBean.getStatus())){
+            Long afterSalesOrderUpdateTime = Long.parseLong(afterSalesOrderResp.getUpdateTime());
+            Long orderUpdateTime = orderBean.getGmtModified();
+            if(orderUpdateTime.longValue()>afterSalesOrderUpdateTime.longValue()){
+                orderCompareAfterSaleOrder = true;
+            }
+        }
+        return false;
+    }
 }

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;
 
 }