From 75bac456c3d66f6b173b1213776158c3bc5f8b96 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期日, 05 十一月 2023 09:45:24 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 90 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 68 insertions(+), 22 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 006f64e..e31e2da 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
@@ -187,6 +187,8 @@
SiteBooking siteBooking = new SiteBooking();
siteBooking.setId(id);
siteBooking.setStatus(1);
+ siteBooking.setPayType(4);
+ siteBooking.setPayUserId(UserExt.getUser().getObjectId());
iSiteBookingService.updateById(siteBooking);
return new ResultUtil<>(0,0,"手动支付成功",null,null);
@@ -670,10 +672,7 @@
Integer objectId = UserExt.getUser().getObjectId();
String cityCode = null;
- if(objectType == 2){//城市管理员
- CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- cityCode = cityManager.getCityCode();
- }
+
List<Map<String, Object>> list = storeService.queryProvince(cityCode);
model.addAttribute("province", list);
Object code = list.get(0).get("code");
@@ -689,7 +688,16 @@
List<TSite> list3 = siteService.list(new QueryWrapper<TSite>().eq("storeId", store.getId()).eq("state", 1));
model.addAttribute("site", list3);
model.addAttribute("objType", UserExt.getUser().getObjectType());
-
+ // 查询运营商下所有门店 所有场地
+ 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("objectType", objectType);
return PREFIX+"yuyue_edit.html";
}
@@ -805,23 +813,32 @@
Integer objectId = UserExt.getUser().getObjectId();
String cityCode = null;
- if(objectType == 2){//城市管理员
- CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- cityCode = cityManager.getCityCode();
- }
+
+
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("objectType", objectType);
return PREFIX+"yuyue_info.html";
}
@@ -847,10 +864,20 @@
studentQeryDto.setStart(split[0]);
studentQeryDto.setEnd(split[1]);
}
-
-
-
-
+ // 如果当前登陆人是运营商 只查询该运营商下的课包的数据
+ 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());
+ // 根据门店ids 查询所有课包ids
+ List<TCoursePackage> tCoursePackages = new ArrayList<>();
+ for (Integer storeId : storeIds) {
+ List<TCoursePackage> coursePackageByStoreId = coursePackageClient.getCoursePackageByStoreId(storeId);
+ tCoursePackages.addAll(coursePackageByStoreId);
+ }
+ List<Integer> coursePackageByStoreIds = tCoursePackages.stream().distinct().map(TCoursePackage::getId).collect(Collectors.toList());
+ studentQeryDto.setCoursePackageIds(coursePackageByStoreIds);
+ }
List<Map<String, Object>> pays = coursePackageClient.getStudentTotal(studentQeryDto);
System.out.println("=========getStudentTotal======="+pays);
@@ -869,14 +896,13 @@
pacQueryDto.setStart(split[0]);
pacQueryDto.setEnd(split[1]);
}
-
-
-
-
+ if (UserExt.getUser().getObjectType() == 2){
+ List<Integer> storeIds = storeService.list(new QueryWrapper<TStore>().eq("operatorId", UserExt.getUser().getObjectId()))
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ pacQueryDto.setStoreIds(storeIds);
+ }
List<Map<String, Object>> pays = coursePackageClient.bypac(pacQueryDto);
-
System.out.println("=========getStudentTotal======="+pays);
-
return pays;
}
@@ -923,7 +949,27 @@
}
List<Map<String,Object>> orders = ballClient.listorder(bookingQuery);
System.out.println("=======ballQueryDto=========="+bookingQuery);
+ for (Map<String, Object> vo : orders) {
+
+ if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 1){
+ vo.put("payType","微信");
+ }
+ if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 2){
+ vo.put("payType","支付宝");
+ }
+ if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 3){
+ vo.put("payType","玩湃币");
+ }
+ if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 4){
+ if (vo.get("payUserId")!=null){
+ User payUserId = userService.getById(Integer.parseInt(vo.get("payUserId").toString()));
+ if(payUserId!=null){
+ vo.put("payType","手动支付"+"-"+payUserId.getName());
+ }
+ }
+ }
+ }
return orders;
}
@@ -1143,7 +1189,6 @@
String booker = siteBooking.getBooker();
TAppUser appUserByPhone = appUserClient.getAppUserByPhone(phone);
TStore byId1 = storeService.getById(siteBooking.getStoreId());
-
if (appUserByPhone== null){
// 则当前预约人不是会员 添加到会员表里
TAppUser tAppUser = new TAppUser();
@@ -1159,6 +1204,7 @@
tAppUser.setInsertTime(new Date());
tAppUser.setPassword(MD5.md5("111111"));
appUserClient.addAppUser1(tAppUser);
+ siteBooking.setAppUserId(tAppUser.getId());
}else{
siteBooking.setAppUserId(appUserByPhone.getId());
}
--
Gitblit v1.7.1