Skip to content

O
order-group
Commit 6ebed2f8 by zhiheng.zhang
Options

拼团订单头部按钮

parent 14192c24
Showing with 5 additions and 3 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -4411,7 +4411,7 @@ public class OrderAdapter { ...@@ -4411,7 +4411,7 @@ public class OrderAdapter {
List<Integer> afterSaleStatusList = Arrays.asList(AfterSalesStatus.PENDING.getIndex(),AfterSalesStatus.RETURNING.getIndex(),AfterSalesStatus.GOODS_RETURNED.getIndex(),AfterSalesStatus.REJECTED.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(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; refundButtonDisable = true;
} }
if(null == orderBean.getAfterSalesOrderResp() && null != orderBean.getGmtDelivery() && (DateUtil.addDays(new Date(orderBean.getGmtDelivery()),30)).compareTo(new Date()) == -1){ if(null == orderBean.getAfterSalesOrderResp() && null != orderBean.getGmtDelivery() && (DateUtil.addDays(new Date(orderBean.getGmtDelivery()),30)).compareTo(new Date()) == -1){
...@@ -4425,7 +4425,7 @@ public class OrderAdapter { ...@@ -4425,7 +4425,7 @@ public class OrderAdapter {
} }
}else{ }else{
List<Integer> noDeliveryAfterSalesStatus = Arrays.asList(AfterSalesStatus.PENDING.getIndex(),AfterSalesStatus.COMPLETE.getIndex()); 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; refundButtonDisable = true;
} }
if(null != orderBean.getAfterSalesOrderResp() && noDeliveryAfterSalesStatus.contains( orderBean.getAfterSalesOrderResp().getAfterSalesStatus())){ if(null != orderBean.getAfterSalesOrderResp() && noDeliveryAfterSalesStatus.contains( orderBean.getAfterSalesOrderResp().getAfterSalesStatus())){
...@@ -4437,9 +4437,11 @@ public class OrderAdapter { ...@@ -4437,9 +4437,11 @@ public class OrderAdapter {
private boolean getOrderCompareAfterSaleOrder(QueryOrdersResponse.DataBean.OrderBean orderBean){ private boolean getOrderCompareAfterSaleOrder(QueryOrdersResponse.DataBean.OrderBean orderBean){
boolean orderCompareAfterSaleOrder = false; boolean orderCompareAfterSaleOrder = false;
List<Integer> orderStatusList = Arrays.asList(OrderStatus.RECEIPT.getCode(),OrderStatus.DISTRIBUTION.getCode(),OrderStatus.COMPLETE.getCode());
//是否忽略售后单状态”呀，大部分情况都是false；只有拒绝退款后继续发货状态并行时新赠的“是否忽略售后单状态”字段为true //是否忽略售后单状态”呀，大部分情况都是false；只有拒绝退款后继续发货状态并行时新赠的“是否忽略售后单状态”字段为true
AfterSalesOrderResp afterSalesOrderResp = orderBean.getAfterSalesOrderResp(); 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()) && (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()) && (orderStatusList.contains(orderBean.getStatus()))))) {
orderCompareAfterSaleOrder = true; orderCompareAfterSaleOrder = true;
} }
return orderCompareAfterSaleOrder; 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