From 72e6562ca013e531862a461c2acee822983b03d0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 May 2022 15:51:02 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java
index 975668d..e5ac024 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java
@@ -9,20 +9,21 @@
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.CustomerDataDictionary;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.SysOrder;
+import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.bean.SysVipInfo;
+import com.matrix.system.hive.bean.SysVipLevel;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.ShoppingGoodsDao;
import com.matrix.system.hive.dao.SysVipLabelDao;
import com.matrix.system.hive.pojo.CzXkVo;
-import com.matrix.system.hive.service.MoneyCardUseService;
-import com.matrix.system.hive.service.SysOrderService;
-import com.matrix.system.hive.service.SysVipInfoService;
+import com.matrix.system.hive.service.*;
import com.matrix.system.padApi.dto.PadVipListDto;
import com.matrix.system.score.dao.ScoreVipDetailDao;
import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting;
@@ -108,6 +109,31 @@
}
}
+ @Resource
+ private SysVipLevelService cardLevelService;
+
+ @ApiOperation(value = "显示所有的会员卡等级信息,不分页", notes = "显示所有的会员卡等级信息,不分页")
+ @GetMapping(value = "/all")
+ public AjaxResult all() {
+ SysVipLevel sysVipLevel = new SysVipLevel();
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, cardLevelService.findByModel(sysVipLevel), null);
+ }
+
+ @Resource
+ private SysShopInfoService shopInfoService; // 店铺Service
+
+ @ApiOperation(value = "所属门店,不分页", notes = "所属门店,不分页")
+ @GetMapping(value = "/findShopByRole")
+ public AjaxResult findShopByRole() {
+ SysUsers user = getMe();
+ SysShopInfo shopInfo = new SysShopInfo();
+ shopInfo.setCompanyId(user.getCompanyId());
+ if(!user.getSuUserType().equals(AppConstance.USER_TYPE_ADMIN) && !user.getShopRole().equals(Dictionary.FLAG_YES_Y)){
+ shopInfo.setId(user.getShopId());
+ }
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, shopInfoService.findByModel(shopInfo), null);
+ }
+
/**
* 查看会员信息
*/
--
Gitblit v1.9.1