From 1e1315f441b9fdceeb6c753a47f7122c6111dbec Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 10 Mar 2022 11:20:51 +0800
Subject: [PATCH] fix alpha config
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java
index dbc9272..19fc17f 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java
@@ -1,7 +1,6 @@
package com.matrix.system.shopXcx.api.action;
-import com.matrix.component.rabbitmq.RabiitMqTemplate;
-import com.matrix.component.redis.RedisUserLoginUtils;
+import com.matrix.system.common.init.UserCacheManager;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.VerifyResult;
@@ -75,7 +74,7 @@
private SysBeauticianStateService sysBeauticianStateService;
@Autowired
- RedisUserLoginUtils redisUserLoginUtils;
+ private UserCacheManager userCacheManager;
@Autowired
ShopProductDao productDao;
@@ -86,8 +85,6 @@
@Autowired
SysVipInfoDao sysVipInfoDao;
- @Autowired
- RabiitMqTemplate rabiitMqTemplate;
@Autowired
SysProjUseDao projUseDao;
@@ -228,6 +225,13 @@
if (vipInfo == null) {
throw new GlobleException("会员不存在");
}
+
+ if (SysVipInfo.VALID_FLAG_N == vipInfo.getValidFlag()) {
+ AjaxResult ajaxResult = AjaxResult.buildSuccessInstance(new ArrayList<>(), "获取成功");
+ ajaxResult.putInMap("proj", new ServiceProductListVo());
+ return ajaxResult;
+ }
+
ServiceProductListVo productListVo = new ServiceProductListVo();
productListVo.setName(vipInfo.getVipName());
productListVo.setVipId(vipInfo.getId());
@@ -273,7 +277,7 @@
@RequestMapping(value = "/createServiceOrder")
public @ResponseBody
AjaxResult createServiceOrder(@RequestBody Onlinebooking onlinebooking) {
- SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ SysVipInfo sysVipInfo = userCacheManager.getLoginUser();
SysVipInfo vipInfo = vipInfoDao.selectByPhone(sysVipInfo.getPhone(),HostInterceptor.getCompanyId());
SysProjUse sysProjUse = projUseDao.selectById(Long.parseLong(onlinebooking.getProductId() + ""));
Date yyTime = DateUtil.stringToDate(onlinebooking.getTimeStr(), DateUtil.DATE_FORMAT_MM);
@@ -367,8 +371,14 @@
@PostMapping(value = "/getServiceOrderList")
@ResponseBody
public AjaxResult findServiceOrderList(@RequestBody @Validated ErpServiceOrderListDto orderListDto) {
- SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ SysVipInfo sysVipInfo = userCacheManager.getLoginUser();
orderListDto.setVipId(sysVipInfo.getId());
+
+ SysVipInfo vipInfo = sysVipInfoDao.selectById(sysVipInfo.getId());
+ if (SysVipInfo.VALID_FLAG_N == vipInfo.getValidFlag()) {
+ return AjaxResult.buildSuccessInstance(new ArrayList<>(), "查询成功");
+ }
+
List<ErpServiceOrderListVo> apiServiceOrderListInPage = projServicesDao.findWxServiceOrderList(orderListDto);
return AjaxResult.buildSuccessInstance(apiServiceOrderListInPage,"查询成功");
}
--
Gitblit v1.9.1