From 47e23cf659d4cc58bc93b44b16e64e82efcfb08d Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 24 七月 2024 17:34:27 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 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 1fe189b..138b203 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
@@ -221,32 +221,38 @@
@RequestMapping("/siteDetailsOfSearch")
@ResponseBody
public Object siteDetailsOfSearch(String provinceId,String cityId,Integer operatorId,String storeName){
+ Integer storeId = null;
if (UserExt.getUser().getObjectType()== 2){
// 筛选这个运营商下的门店
operatorId = UserExt.getUser().getObjectId();
}
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName,page);
+ if (UserExt.getUser().getObjectType()== 3){
+ // 筛选这个运营商下的门店
+ storeId = UserExt.getUser().getObjectId();
+ }
+ List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName,storeId);
if (storeList.size() > 0 ){
for (Map<String, Object> stringObjectMap : storeList) {
String provinceName = (String) stringObjectMap.get("province");
String cityName = (String) stringObjectMap.get("city");
stringObjectMap.put("provinceCity",provinceName+cityName);
+
Integer managerId = (Integer) stringObjectMap.get("operatorId");
- if (managerId == null){
- stringObjectMap.put("accountName","平台");
+
+ Integer type = (Integer) stringObjectMap.get("type");
+ if (type == 1){
+ // 平台
+ stringObjectMap.put("account","平台");
}else{
- if (managerId==0){
- stringObjectMap.put("accountName","平台");
- }else{
- TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", managerId));
- if (ToolUtil.isNotEmpty(operator)){
- stringObjectMap.put("accountName",operator.getName());
- }else{
- stringObjectMap.put("accountName","平台");
- }
+ // 根据门店获取运营商id 查询运营商名称
+
+ // 查询运营商名称
+ TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", managerId));
+ if (ToolUtil.isNotEmpty(operator)){
+ stringObjectMap.put("account",operator.getName());
}
}
+
}
}
return storeList;
--
Gitblit v1.7.1