From 26435ca077b1265ac794417fe8fdd812bc36302a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 09 Oct 2022 15:21:19 +0800
Subject: [PATCH] 20220902

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 4f7d45f..761b355 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -531,7 +531,7 @@
             long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
             orderDetailVo.setRemainTime(remainTime);
         }
-        Integer deliverType = orderInfo.getDeliverType();
+        Integer deliverType = (ObjectUtil.isEmpty(orderInfo.getDeliverType()) ? new Integer(0):orderInfo.getDeliverType());
         if(2 == deliverType){
             MallShopApply mallShopApply = mallShopApplyMapper.selectById(orderInfo.getShopId());
             if(ObjectUtil.isNotEmpty(mallShopApply)){

--
Gitblit v1.9.1