订单详情状态描述

ch-core/src/main/java/com/wwdz/ch/core/entity/exchange/ExchangeApplyOrderVo.java

@@ -62,6 +62,11 @@ public class ExchangeApplyOrderVo implements Entity {
      */
     private String stateDesc;
 
+    /**
+     * 状态下跳转的描述
+     */
+    private String stateLinkDesc;
+
     /**
      * 处理截止时间
      */

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/ExchangeOrderDetailVo.java

@@ -161,6 +161,11 @@ public class ExchangeOrderDetailVo implements Entity {
      */
     private String stateDesc;
 
+    /**
+     * 状态链接描述（跳转到其他页面的链接描述）
+     */
+    private String stateLinkDesc;
+
     /**
      * 商品类型1一口价2竞拍3藏品
      */

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/ExchangeApplyOrderServiceImpl.java

@@ -277,10 +277,15 @@ public class ExchangeApplyOrderServiceImpl implements ExchangeApplyOrderService
                 }
                 if (exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.PRE_HANDLE.getCode()) {
                     exchangeApplyOrderVo.setStateTitle("待处理");
-                } else if (exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.AGREE.getCode()
-                || exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.SYSTEM_AGREE.getCode()) {
+                } else if (exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.AGREE.getCode()) {
                     exchangeApplyOrderVo.setStateTitle("交换中");
                     exchangeApplyOrderVo.setStateDesc("同意交换");
+                    exchangeApplyOrderVo.setStateLinkDesc("前往订单详情去发货");
+                }
+                else if(exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.SYSTEM_AGREE.getCode()) {
+                    exchangeApplyOrderVo.setStateTitle("交换中");
+                    exchangeApplyOrderVo.setStateDesc("同意交换");
+                    exchangeApplyOrderVo.setStateLinkDesc("前往订单详情");
                 } else if (exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.DISAGREE.getCode()) {
                     exchangeApplyOrderVo.setStateTitle("交换关闭");
                     exchangeApplyOrderVo.setStateDesc("拒绝交换，交换关闭");
@@ -296,8 +301,8 @@ public class ExchangeApplyOrderServiceImpl implements ExchangeApplyOrderService
                 } else if (exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.FINISH.getCode()) {
                     exchangeApplyOrderVo.setStateTitle("交换完成");
                     exchangeApplyOrderVo.setStateDesc("交换完成");
+                    exchangeApplyOrderVo.setStateLinkDesc("前往订单详情");
                 }
-
                 //处理申请的截止时间 48小时内
                 Date now = new Date();
                 Instant instant = now.toInstant().plus(Duration.ofHours(48));
@@ -358,10 +363,15 @@ public class ExchangeApplyOrderServiceImpl implements ExchangeApplyOrderService
 
             if (exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.PRE_HANDLE.getCode()) {
                 exchangeApplyOrderVo.setStateTitle("待处理");
-            } else if (exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.AGREE.getCode()
-                    || exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.SYSTEM_AGREE.getCode()) {
+            } else if (exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.AGREE.getCode()) {
+                exchangeApplyOrderVo.setStateTitle("交换中");
+                exchangeApplyOrderVo.setStateDesc("同意交换");
+                exchangeApplyOrderVo.setStateLinkDesc("前往订单详情去发货");
+            }
+            else if(exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.SYSTEM_AGREE.getCode()) {
                 exchangeApplyOrderVo.setStateTitle("交换中");
                 exchangeApplyOrderVo.setStateDesc("同意交换");
+                exchangeApplyOrderVo.setStateLinkDesc("前往订单详情");
             } else if (exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.DISAGREE.getCode()) {
                 exchangeApplyOrderVo.setStateTitle("交换关闭");
                 exchangeApplyOrderVo.setStateDesc("拒绝交换，交换关闭");
@@ -377,6 +387,7 @@ public class ExchangeApplyOrderServiceImpl implements ExchangeApplyOrderService
             } else if (exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.FINISH.getCode()) {
                 exchangeApplyOrderVo.setStateTitle("交换完成");
                 exchangeApplyOrderVo.setStateDesc("交换完成");
+                exchangeApplyOrderVo.setStateLinkDesc("前往订单详情");
             }
 
             //处理申请的截止时间 48小时内

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/ExchangeOrderServiceImpl.java

@@ -233,8 +233,13 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService {
             exchangeOrderDetailVo.setStateTitle(exchangeOrderDetailVo.getStateName());
             if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode()) {
                 exchangeOrderDetailVo.setStateDesc("藏品验货不通过，订单取消，交换关闭。");
-            } else if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_EXCHANGE.getCode()) {
-
+            } else if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_INSPECTION.getCode()) {
+                exchangeOrderDetailVo.setStateDesc("请耐心等待，平台收到货后会尽快验货");
+            } else if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_SEND.getCode()) {
+                exchangeOrderDetailVo.setStateTitle("待平台发货");
+                exchangeOrderDetailVo.setStateDesc("两方的藏品都验货通过，将在24小时内发货，请耐心等待");
+            } else if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_SIGNED.getCode()) {
+                exchangeOrderDetailVo.setStateDesc("已发货，请查收");
             }
             Date date = distributionOrder.getCreateTime();
             Instant instant = date.toInstant().plus(Duration.ofHours(48));