From 33a6562f5f72e02ba781beca60becaf9ee8077b2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Dec 2020 10:41:50 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java | 8 ++++++++
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java | 13 +++++++++++++
2 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
index 966de14..e587b11 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
@@ -14,6 +14,14 @@
public class ApiOrderAction {
+ public AjaxResult findShoppingGoodsType() {
+ return null;
+ }
+
+ public AjaxResult findShoppingGoods() {
+ return null;
+ }
+
@PostMapping(value = "/createOrder")
public AjaxResult createOrder() {
return null;
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
index f091ec5..c25ac3f 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
@@ -15,6 +15,7 @@
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.hive.action.BaseController;
+import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.bean.SysVipLevel;
import com.matrix.system.hive.service.SysVipInfoService;
import com.matrix.system.hive.service.SysVipLevelService;
@@ -131,4 +132,16 @@
}
return AjaxResult.buildFailInstance("修改失败");
}
+
+ @ApiOperation(value = "获取用户信息列表", notes = "获取用户信息列表")
+ @GetMapping(value = "/findAllVipInfo")
+ public AjaxResult findAllVipInfo() {
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ SysVipInfo sysVipInfo = new SysVipInfo();
+ if(!DataAuthUtil.hasAllShopAuth()) {
+ sysVipInfo.setShopId(user.getShopId());
+ }
+
+ return AjaxResult.buildSuccessInstance(sysVipInfoService.findAll(sysVipInfo));
+ }
}
--
Gitblit v1.9.1