From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxErpOrderAction.java | 15 +++++++++------
1 files changed, 9 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 bfe16d7..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
@@ -1,9 +1,8 @@
package com.matrix.system.shopXcx.api.action;
-import com.matrix.component.redis.RedisClient;
-import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.system.app.authority.AppAuthorityManager;
+import com.matrix.system.common.init.UserCacheManager;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.hive.bean.SysOrderFlow;
import com.matrix.system.hive.bean.SysVipInfo;
@@ -46,14 +45,12 @@
@Autowired
private AppAuthorityManager authorityManager;
- @Autowired
- private RedisClient redisClient;
@Autowired
private SysVipInfoDao vipInfoDao;
@Autowired
- RedisUserLoginUtils redisUserLoginUtils;
+ private UserCacheManager userCacheManager;
@Autowired
private SysOrderDao sysOrderDao;
@@ -75,9 +72,15 @@
})
@PostMapping(value = "/findUserOrderList")
public AjaxResult findUserOrderList(@RequestBody @Validated ErpOrderListDto erpOrderListDto) {
- SysVipInfo vipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ 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