Commit 8be53240 by zhiheng.zhang

拼团订单定出处理逻辑

parent c6decfb0
...@@ -4439,14 +4439,9 @@ public class OrderAdapter { ...@@ -4439,14 +4439,9 @@ public class OrderAdapter {
boolean orderCompareAfterSaleOrder = false; boolean orderCompareAfterSaleOrder = false;
//是否忽略售后单状态”呀,大部分情况都是false;只有拒绝退款后继续发货状态并行时新赠的“是否忽略售后单状态”字段为true //是否忽略售后单状态”呀,大部分情况都是false;只有拒绝退款后继续发货状态并行时新赠的“是否忽略售后单状态”字段为true
AfterSalesOrderResp afterSalesOrderResp = orderBean.getAfterSalesOrderResp(); AfterSalesOrderResp afterSalesOrderResp = orderBean.getAfterSalesOrderResp();
//已发货 if(null != afterSalesOrderResp && 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()))){
if(null != afterSalesOrderResp && 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;
Long afterSalesOrderUpdateTime = Long.parseLong(afterSalesOrderResp.getUpdateTime());
Long orderUpdateTime = orderBean.getGmtModified();
if(orderUpdateTime.longValue()>afterSalesOrderUpdateTime.longValue()){
orderCompareAfterSaleOrder = true;
}
} }
return false; return orderCompareAfterSaleOrder;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment