From 781fb421fdda4aff90394777b31aea7664cc6e23 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 16 May 2022 09:44:19 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxErpOrderAction.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 e127ce4..78a6730 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
@@ -75,6 +75,12 @@
SysVipInfo vipInfo = userCacheManager.getLoginUser();
erpOrderListDto.setVipId(vipInfo.getId());
+
+ SysVipInfo sysVipInfo = vipInfoDao.selectById(vipInfo.getId());
+ if (sysVipInfo.getValidFlag() == SysVipInfo.VALID_FLAG_N) {
+ return AjaxResult.buildSuccessInstance(new ArrayList<>(), "查询成功");
+ }
+
List<ErpOrderDetailVo> rows = sysOrderDao.selectErpOrderList(erpOrderListDto);
rows.forEach(item -> {
item.setItems(orderItemDao.selectErpOrderItemByOrderId(item.getOrderId()));
--
Gitblit v1.9.1