From 2bb111939922d8e48fe11374bfe8ef2834a5bb43 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 十一月 2023 19:51:01 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 60 ++++++++++++++++++++++++------------------------------------
1 files changed, 24 insertions(+), 36 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index aea3b42..74d3f46 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -753,7 +753,26 @@
String convertedValue = s.substring(11);
strings1.add(convertedValue);
}
-
+ switch (book.getStatus()){
+ case 0:
+ model.addAttribute("state","待支付");
+ break;
+ case 1:
+ model.addAttribute("state","待核销");
+ break;
+ case 2:
+ model.addAttribute("state","已到店");
+ break;
+ case 3:
+ model.addAttribute("state","已完成");
+ break;
+ case 4:
+ model.addAttribute("state","已过期");
+ break;
+ case 5:
+ model.addAttribute("state","已取消");
+ break;
+ }
System.out.println("========strings1====="+strings1);
//时间段
@@ -823,43 +842,12 @@
}
System.out.println("-------------"+timeRanges);
model.addAttribute("timeRanges",timeRanges);
-
System.out.println("======timeRanges========"+timeRanges);
-
-
-
-
-
-
Integer objectType = UserExt.getUser().getObjectType();
- Integer objectId = UserExt.getUser().getObjectId();
-
- String cityCode = null;
-
-
- List<Map<String, Object>> list = storeService.queryProvince(cityCode);
- model.addAttribute("province", list);
-
- Object code = list.get(0).get("code");
- List<Map<String, Object>> list1 = storeService.queryCity(code.toString(), cityCode);
-
- model.addAttribute("city", list1);
- String code1 = list1.get(0).get("code").toString();
-
- List<TStore> list2 = storeService.list(new QueryWrapper<TStore>().eq("cityCode", code1).eq("state", 1));
- model.addAttribute("store", list2);
- TStore store = list2.get(0);
- List<TSite> list3 = siteService.list(new QueryWrapper<TSite>().eq("storeId", store.getId()).eq("state", 1));
- model.addAttribute("site", list3);
- // 查询运营商下所有门店 所有场地
- if (objectType == 2){
- List<TStore> stores = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId));
- model.addAttribute("store", stores);
- // 门店ids
- List<Integer> storeIds = stores.stream().map(TStore::getId).collect(Collectors.toList());
- List<TSite> sites = siteService.list(new QueryWrapper<TSite>().in("storeId", storeIds));
- model.addAttribute("site", sites);
- }
+ model.addAttribute("province", book.getProvince());
+ model.addAttribute("city", book.getCity());
+ model.addAttribute("store",storeService.getById(book.getStoreId()).getName());
+ model.addAttribute("siteName",siteService.getById(book.getSiteId()).getName());
model.addAttribute("objectType", objectType);
return PREFIX+"yuyue_info.html";
}
--
Gitblit v1.7.1