From 61bbd595ee2bc3c67b40878894dcc07174c6eea6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 24 九月 2024 10:15:30 +0800
Subject: [PATCH] 玩湃微信商户分账
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 5 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 e1f7218..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
@@ -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());
@@ -249,6 +294,9 @@
return couponListOfSearch;
}
+ /**
+ * 根据运营商ID 获取运营商管理的省市
+ */
/**
* 获取 优惠券管理
@@ -267,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);
}
--
Gitblit v1.7.1