From febef797f9a8c98150275a6e0b721551c6ec383b Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 01 十一月 2023 17:13:59 +0800
Subject: [PATCH] 支付会员送券功能补充 运营商权限bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index 266e1e8..a572c82 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -237,6 +237,23 @@
User byId1 = userMapper.selectById(byId.getStoreStaffId());
model.addAttribute("city",byId1);
model.addAttribute("type",1);
+ // 如果当前登陆人是运营商
+ if (UserExt.getUser().getObjectType()==2){
+ // 查询这个运营商管理的省
+ TOperator id1 = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("id", UserExt.getUser().getObjectId()));
+ if (id1.getType()==1){
+ // 全国
+ List<TCity> list3 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list3);
+ }else{
+ // 找到他管理的省
+ List<TOperatorCity> list4 = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", UserExt.getUser().getObjectId()).eq("pid", 0));
+ model.addAttribute("list",list4);
+ }
+ }else{
+ List<TCity> list5 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list5);
+ }
return PREFIX + "TShop_edit.html";
}
@RequestMapping("/tShop_update1/{id}")
@@ -572,10 +589,10 @@
}
}else {
- TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getProvinceCode()));
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, tStore.getProvinceCode()));
tStore.setProvince(one.getName());
tStore.setProvinceCode(one.getCode());
- TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getCityCode()));
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, tStore.getCityCode()));
tStore.setCity(one1.getName());
tStore.setCityCode(one1.getCode());
}
@@ -598,10 +615,12 @@
userMapper.updateById(user);
tStore.setLon(lon);
tStore.setLat(lat);
+ // 运营商编辑
+ if (UserExt.getUser().getObjectType()==2){
+ tStore.setOperatorId(null);
+ }
storeService.updateById(tStore);
String ids1 = byIdc.getIds();
-
-
HashMap<String, String> mapx = new HashMap<>();
mapx.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
--
Gitblit v1.7.1