换藏订单详情

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

@@ -150,6 +150,17 @@ public class ExchangeOrderDetailVo implements Entity {
      */
     private Date expireTime;
 
+
+    /**
+     * 状态标题，用于前端展示
+     */
+    private String stateTitle;
+
+    /**
+     * 状态标题的描述
+     */
+    private String stateDesc;
+
     /**
      * 商品类型1一口价2竞拍3藏品
      */

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

@@ -1322,7 +1322,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
 
     public void checkPrePayTimeOut(String distributionOrderId, int type){
         DistributionOrder distributionOrder = distributionOrderDao.findById(distributionOrderId);
-        if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode() || distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_EXCHANGE.getCode()) {
+        if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode()) {
             long diffInMillies = Math.abs(new Date().getTime() -  distributionOrder.getCreateTime().getTime());
             if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode()) {
                 long diffInMinutes = diffInMillies / (60 * 1000);
@@ -1335,16 +1335,6 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 long diffInHours = diffInMillies / (60 * 1000 * 60);
                 if (diffInHours >= 24) {
                     distributionOrderDao.updateState(distributionOrder.getDistributionOrderId(), DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode());
-                    //换藏的品取消订单后恢复库存
-                    if (distributionOrder.getType().intValue() == DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()) {
-                        SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
-                        supplierItemDao.updateStock(distributionOrder.getItemId(), supplierItem.getStock() + distributionOrder.getItemNum());
-                        //订单快照设置为无效
-                        ExchangeOrderSnapshot exchangeOrderSnapshot = new ExchangeOrderSnapshot();
-                        exchangeOrderSnapshot.setDistributionOrderId(distributionOrderId);
-                        exchangeOrderSnapshot.setIsValid(false);
-                        exchangeOrderSnapshotDao.update(exchangeOrderSnapshot);
-                    }
                 }
             }
         }
@@ -1360,7 +1350,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
         DistributionOrderRequestDto dto = new DistributionOrderRequestDto();
         dto.setBuyerId(userId);
         dto.setSellerId(distributorId);
-        dto.setStateList(Arrays.asList(DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode(), DistributionEnum.DistributionOrderStateEnum.PRE_EXCHANGE.getCode()));
+        dto.setStateList(Arrays.asList(DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode()));
         List<DistributionOrder> prePayList = distributionOrderDao.findByPage(dto);
         prePayList.forEach(distributionOrder -> {
             long diffInMillies = Math.abs(new Date().getTime() -  distributionOrder.getCreateTime().getTime());
@@ -1376,16 +1366,6 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 long diffInHours = diffInMillies / (60 * 1000 * 60);
                 if (diffInHours >= 24) {
                     distributionOrderDao.updateState(distributionOrder.getDistributionOrderId(), DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode());
-                    //换藏的品取消订单后恢复库存
-                    if (distributionOrder.getType().intValue() == DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()) {
-                        SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
-                        supplierItemDao.updateStock(distributionOrder.getItemId(), supplierItem.getStock() + distributionOrder.getItemNum());
-                        //订单快照设置为无效
-                        ExchangeOrderSnapshot exchangeOrderSnapshot = new ExchangeOrderSnapshot();
-                        exchangeOrderSnapshot.setDistributionOrderId(distributionOrder.getDistributionOrderId());
-                        exchangeOrderSnapshot.setIsValid(false);
-                        exchangeOrderSnapshotDao.update(exchangeOrderSnapshot);
-                    }
                 }
             }
         });

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

@@ -162,7 +162,7 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService {
     @Override
     public Result findOrderDetail(DistributionOrderRequestDto dto) {
         try {
-            //检查是否有超时未支付订单
+            //检查是否有超时未寄出的
             checkPrePayTimeOut(dto.getUserId(), null);
             dto.setBuyerId(dto.getUserId());
             DistributionOrder distributionOrder = distributionOrderDao.findById(dto.getDistributionOrderId());
@@ -230,6 +230,10 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService {
                     exchangeOrderDetailVo.setExchangeApplyOrderTypeName(ExchangeApplyOrderEnum.TypeEnum.RECEIVE.getDes());
                 }
             }
+            exchangeOrderDetailVo.setStateTitle(exchangeOrderDetailVo.getStateName());
+            if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode()) {
+                exchangeOrderDetailVo.setStateDesc("藏品验货不通过，订单取消，交换关闭。");
+            }
             Date date = distributionOrder.getCreateTime();
             Instant instant = date.toInstant().plus(Duration.ofHours(48));
             Date time = Date.from(instant);