From 05e8b12d65aa67415f0f32893449a9a48a6c9a48 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 18 Jan 2021 00:10:50 +0800
Subject: [PATCH] modify
---
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