From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 一月 2025 18:15:00 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 98 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 78 insertions(+), 20 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 70bb32f..c468218 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
@@ -139,11 +139,11 @@
}
}
if (coupon.getPublisherType() == 2) {
- CityManager cityManager = cmgrClient.queryCityManagerById(tStore.getCityManagerId());
- if (ToolUtil.isNotEmpty(cityManager)) {
- tStore.setProvince(tStore.getProvince() + tStore.getCity());
- tStore.setPhone(cityManager.getName() + "-" + cityManager.getPhone());
- }
+ User byId = userService.getById(tStore.getStoreStaffId());
+
+ tStore.setProvince(tStore.getProvince() + tStore.getCity());
+ tStore.setPhone(byId.getName() + "-" + byId.getPhone());
+
}
}
}
@@ -199,15 +199,57 @@
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{
+ 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","平台");
+ }
+ }
+ }
+ }
+ }
+ return storeList;
+ }
+ // 查询场地列表
+ @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();
+ }
+ 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");
+
+ Integer type = (Integer) stringObjectMap.get("type");
+ if (type == 1){
+ // 平台
+ stringObjectMap.put("account","平台");
+ }else{
+ // 根据门店获取运营商id 查询运营商名称
+
+ // 查询运营商名称
TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", managerId));
if (ToolUtil.isNotEmpty(operator)){
- stringObjectMap.put("accountName",operator.getName());
- }else{
- stringObjectMap.put("accountName","平台");
-
+ stringObjectMap.put("account",operator.getName());
}
}
@@ -238,6 +280,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 +290,13 @@
}
// 运营商可以查看平台添加的优惠券应只展示使用范围为全国通用、
// 指定城市有运营商管辖的、指定门店有运营商旗下门店
+ List<Map<String, Object>> couponListOfSearch = client.getCouponListOfSearch(ofSearch);
- return client.getCouponListOfSearch(ofSearch);
+ return couponListOfSearch;
}
+ /**
+ * 根据运营商ID 获取运营商管理的省市
+ */
/**
* 获取 优惠券管理
@@ -266,6 +315,8 @@
ofSearch.setState(state);
ofSearch.setCityCode(cityCode);
ofSearch.setStoreId(storeId);
+ ofSearch.setObjType(UserExt.getUser().getObjectType());
+ ofSearch.setOperatorId(UserExt.getUser().getObjectId());
return client.getCouponListOfSearch1(ofSearch);
}
@@ -274,15 +325,12 @@
@RequestMapping(value = "/listRecord")
@ResponseBody
public Object listRecord(Integer id,String name, Integer type, String phone) {
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
List<TAppUser> tAppUsers = appUserClient.queryByNamePhone(new QueryByNamePhone(name, phone));
if(tAppUsers.size()==0){
return new ArrayList<>();
}
CouponRecordQuery ofSearch = new CouponRecordQuery();
ofSearch.setId(id);
- ofSearch.setLimit(page.getSize());
- ofSearch.setOffset(page.getCurrent());
ofSearch.setIds(tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList()));
ofSearch.setType(type);
List<Map<String, Object>> maps = client.listRecord(ofSearch);
@@ -320,6 +368,14 @@
public Object getCity(Integer province){
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")
@@ -370,14 +426,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.setObjType(UserExt.getUser().getObjectType());
- 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