From ae9bfd2d66f68a553786ac78b12f4390e65e4e09 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 24 十一月 2023 18:30:18 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index bcc1b1e..8d39cc3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -238,6 +238,9 @@
ofSearch.setStoreIds(storeIds);
ofSearch.setObjType(UserExt.getUser().getObjectType());
ofSearch.setOperatorId(UserExt.getUser().getObjectId());
+ // 查询当前门店属于哪个运营商
+ List<TOperatorCity> operatorId = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", UserExt.getUser().getObjectId()));
+ ofSearch.setOperatorCities(operatorId);
}
if (UserExt.getUser().getObjectType()==3) {
ofSearch.setStoreId(UserExt.getUser().getObjectId());
@@ -245,9 +248,13 @@
}
// 运营商可以查看平台添加的优惠券应只展示使用范围为全国通用、
// 指定城市有运营商管辖的、指定门店有运营商旗下门店
+ List<Map<String, Object>> couponListOfSearch = client.getCouponListOfSearch(ofSearch);
- return client.getCouponListOfSearch(ofSearch);
+ return couponListOfSearch;
}
+ /**
+ * 根据运营商ID 获取运营商管理的省市
+ */
/**
* 获取 优惠券管理
@@ -266,6 +273,8 @@
ofSearch.setState(state);
ofSearch.setCityCode(cityCode);
ofSearch.setStoreId(storeId);
+ ofSearch.setObjType(UserExt.getUser().getObjectType());
+ ofSearch.setOperatorId(UserExt.getUser().getObjectId());
return client.getCouponListOfSearch1(ofSearch);
}
@@ -381,9 +390,11 @@
if(UserExt.getUser().getObjectType()==2){
dataVo.setCompany(3);
dataVo.setUserType(2);
+ dataVo.setCityManagerId(UserExt.getUser().getObjectId());
}else if(UserExt.getUser().getObjectType()==3){
dataVo.setStoreIds(UserExt.getUser().getObjectId().toString());
dataVo.setCompany(3);
+ dataVo.setUserType(3);
}else{
dataVo.setUserType(1);
}
--
Gitblit v1.7.1