From a540a342416302805adfb1599599bbbbaa191030 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 08 八月 2025 23:42:13 +0800
Subject: [PATCH] 赛事模块
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 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 25f28b7..a3a092c 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,34 +221,50 @@
@RequestMapping("/siteDetailsOfSearch")
@ResponseBody
public Object siteDetailsOfSearch(String provinceId,String cityId,Integer operatorId,String storeName){
+ List<Map<String, Object>> res = new ArrayList<>();
+ Integer storeId = null;
if (UserExt.getUser().getObjectType()== 2){
// 筛选这个运营商下的门店
operatorId = UserExt.getUser().getObjectId();
+ List<Integer> storeIds = storeService.lambdaQuery().eq(TStore::getOperatorId, operatorId).list()
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ if (storeIds.isEmpty()){
+ storeIds.add(0);
+ }
+ res = storeService.querySiteListOfpageOperator(provinceId,cityId,operatorId,storeName,storeIds);
+ }else if (UserExt.getUser().getObjectType()== 3){
+ // 筛选这个运营商下的门店
+ storeId = UserExt.getUser().getObjectId();
+ res = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName,storeId);
+ }else{
+ List<Integer> storeIds = new ArrayList<>();
+ res = storeService.querySiteListOfpageOperator(provinceId,cityId,operatorId,storeName,storeIds);
}
- List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName);
- if (storeList.size() > 0 ){
- for (Map<String, Object> stringObjectMap : storeList) {
+ if (res.size() > 0 ){
+ for (Map<String, Object> stringObjectMap : res) {
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;
+ return res;
}
/**
@@ -318,15 +334,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);
@@ -392,6 +405,8 @@
if (imgFile != null){
String originalFilename = imgFile.getOriginalFilename();
String newName = originalFilename.substring(imgFile.getOriginalFilename().lastIndexOf("."));
+
+
String url = OssUploadUtil.ossUpload("img/",imgFile);
Map<String, String> map = new HashMap<String, String>();
//是否上传成功
--
Gitblit v1.7.1