From 16fdf754104f0d38fd80e49936dc91cf90505af9 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 17 Jan 2021 19:34:47 +0800
Subject: [PATCH] 消息提醒

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxErpOrderAction.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxErpOrderAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxErpOrderAction.java
index 5f06f91..9a3f9f4 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxErpOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxErpOrderAction.java
@@ -99,12 +99,17 @@
     public AjaxResult findUserOrderList(@RequestBody @Validated ErpOrderListDto erpOrderListDto) {
         BizUser bizUser = redisUserLoginUtils.getLoginUser(BizUser.class);
         SysVipInfo vipInfo = vipInfoDao.selectByPhone(bizUser.getPhoneNumber());
-        erpOrderListDto.setVipId(vipInfo.getId());
-        List<ErpOrderDetailVo> rows=sysOrderDao.selectErpOrderList(erpOrderListDto);
-        rows.forEach(item->{
-            item.setItems(orderItemDao.selectErpOrderItemByOrderId(item.getOrderId()));
-        });
-        return  AjaxResult.buildSuccessInstance(rows,"查询成功");
+        if(vipInfo!=null){
+            erpOrderListDto.setVipId(vipInfo.getId());
+            List<ErpOrderDetailVo> rows=sysOrderDao.selectErpOrderList(erpOrderListDto);
+            rows.forEach(item->{
+                item.setItems(orderItemDao.selectErpOrderItemByOrderId(item.getOrderId()));
+            });
+            return  AjaxResult.buildSuccessInstance(rows,"查询成功");
+        }else{
+            return  AjaxResult.buildFailInstance("未查询到相关订单001");
+        }
+
     }
 
     @ApiOperation(value = "查询用户在ERP中的订单详情" )

--
Gitblit v1.9.1