From 8fb3fad4623a776023a717ad67b8944686c0226f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 29 二月 2024 15:02:43 +0800
Subject: [PATCH] 修改分表规则
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 78 +++++++++++++++++++++++++++++++--------
1 files changed, 62 insertions(+), 16 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 e5a03ce..d632d4f 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
@@ -74,6 +74,7 @@
*/
@RequestMapping("")
public String index(Model model) {
+ model.addAttribute("objectType",UserExt.getUser().getObjectType());
return PREFIX + "TCoupon.html";
}
@@ -96,8 +97,6 @@
model.addAttribute("type",coupon.getType());
return PREFIX + "TCouponRecord.html";
}
-
-
@RequestMapping("/coupon_detail/{id}")
public String memberCouponDetail(@PathVariable Integer id,Model model) {
@@ -124,16 +123,29 @@
list = client.queryCity(coupon.getId());
}
if(coupon.getUseScope()==3){
+ // 门店ids
list1 = client.queryStore(coupon.getId());
+ // 门店集合
list2 = storeService.list(new LambdaQueryWrapper<TStore>().in(TStore::getId, list1));
for (TStore tStore : list2) {
- CityManager cityManager = cmgrClient.queryCityManagerById(tStore.getCityManagerId());
- if (ToolUtil.isNotEmpty(cityManager)){
- tStore.setProvince(tStore.getProvince()+tStore.getCity());
- tStore.setPhone(cityManager.getName()+"-"+cityManager.getPhone());
+ if (coupon.getPublisherType() == 1){
+ // 获取运营商id
+ Integer operatorId = tStore.getOperatorId();
+ TOperator operator = operatorService.getById(operatorId);
+ User user = userService.getById(operator.getUserId());
+ if (ToolUtil.isNotEmpty(user)){
+ tStore.setProvince(tStore.getProvince()+tStore.getCity());
+ tStore.setPhone(user.getName()+"-"+user.getPhone());
+ }
+ }
+ if (coupon.getPublisherType() == 2) {
+ User byId = userService.getById(tStore.getStoreStaffId());
+
+ tStore.setProvince(tStore.getProvince() + tStore.getCity());
+ tStore.setPhone(byId.getName() + "-" + byId.getPhone());
+
}
}
-
}
model.addAttribute("city",list);
model.addAttribute("store",list2);
@@ -187,17 +199,21 @@
String cityName = (String) stringObjectMap.get("city");
stringObjectMap.put("provinceCity",provinceName+cityName);
Integer managerId = (Integer) stringObjectMap.get("operatorId");
- if (managerId==0){
+ if (managerId == null){
stringObjectMap.put("accountName","平台");
}else{
- TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", managerId));
- if (ToolUtil.isNotEmpty(operator)){
- stringObjectMap.put("accountName",operator.getName());
- }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","平台");
+ }
}
}
+
}
}
@@ -220,16 +236,29 @@
ofSearch.setStatus(status);
ofSearch.setState(state);
if (UserExt.getUser().getObjectType()==2) {
+ // 门店ids
+ List<Integer> storeIds = storeService.list(new QueryWrapper<TStore>().eq("operatorId", UserExt.getUser().getObjectId()))
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ 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());
ofSearch.setObjType(UserExt.getUser().getObjectType());
}
+ // 运营商可以查看平台添加的优惠券应只展示使用范围为全国通用、
+ // 指定城市有运营商管辖的、指定门店有运营商旗下门店
+ List<Map<String, Object>> couponListOfSearch = client.getCouponListOfSearch(ofSearch);
-
- return client.getCouponListOfSearch(ofSearch);
+ return couponListOfSearch;
}
+ /**
+ * 根据运营商ID 获取运营商管理的省市
+ */
/**
* 获取 优惠券管理
@@ -248,6 +277,8 @@
ofSearch.setState(state);
ofSearch.setCityCode(cityCode);
ofSearch.setStoreId(storeId);
+ ofSearch.setObjType(UserExt.getUser().getObjectType());
+ ofSearch.setOperatorId(UserExt.getUser().getObjectId());
return client.getCouponListOfSearch1(ofSearch);
}
@@ -303,6 +334,14 @@
return regiService.list(new LambdaQueryWrapper<Region>()
.eq(Region::getParentId,province));
}
+ @RequestMapping(value = "/getCity1")
+ @ResponseBody
+ public Object getCity1(String province){
+ // 获取省的id
+ Integer code = regiService.getOne(new QueryWrapper<Region>().eq("code", province)).getId();
+ return regiService.list(new LambdaQueryWrapper<Region>()
+ .eq(Region::getParentId,code));
+ }
// 通过市 获取运营商
@RequestMapping(value = "/getOperator")
@ResponseBody
@@ -352,9 +391,16 @@
Integer objectType = UserExt.getUser().getObjectType();
dataVo.setUserType(objectType);
dataVo.setCityManagerId(UserExt.getUser().getObjectId());
- if(UserExt.getUser().getObjectType()==3){
+ 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);
}
dataVo.setObjType(UserExt.getUser().getObjectType());
client.insertIntoData(dataVo);
--
Gitblit v1.7.1