From 9baa55cf4292ad0fe80547f9c840e917775411f4 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期日, 05 十一月 2023 09:45:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index 9bb8475..4bbf06d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -32,6 +32,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -165,7 +166,9 @@
TStore store = list2.get(0);
List<TSite> list3 = siteService.list(new QueryWrapper<TSite>().eq("storeId", store.getId()).eq("state", 1));
model.addAttribute("site", list3);
- List<Coach> coaches = coachClient.queryCoachByCity(code1);
+
+
+ List<Coach> coaches = coachClient.queryCoachByOperatorId(objectId);
model.addAttribute("coach", coaches);
System.out.println("========type========"+type);
}
@@ -249,7 +252,7 @@
model.addAttribute("store", list2);
List<TSite> list3 = siteService.list(new QueryWrapper<TSite>().eq("storeId", tCoursePackage.getStoreId()).eq("state", 1));
model.addAttribute("site", list3);
- List<Coach> coaches = coachClient.queryCoachByCity(cityCode);
+ List<Coach> coaches = coachClient.queryCoachByOperatorId(UserExt.getUser().getObjectId());
model.addAttribute("coach", coaches);
List<CoursePackagePaymentConfig> list4 = coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(id);
@@ -835,15 +838,21 @@
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
Integer storeId = null;
- if(objectType == 2){//城市管理员
- CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- provinceCode = cityManager.getProvinceCode();
- cityCode = cityManager.getCityCode();
+ List<Integer> storeIds = new ArrayList<>();
+
+ if(objectType == 2){// 城市管理员
+// CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
+// provinceCode = cityManager.getProvinceCode();
+// cityCode = cityManager.getCityCode();
+ // 获取运营商下的门店ids
+ List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId))
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ storeIds = operatorId;
}
- if(objectType == 3) {//城市管理员
- storeId = objectId;
+ if(objectType == 3) {// 门店
+ storeIds.add(objectId);
}
- Page<Map<String, Object>> mapPage = coursePackageService.queryCoursePackageLists(provinceCode, cityCode, coursePackageTypeId, storeId, name, status, state);
+ Page<Map<String, Object>> mapPage = coursePackageService.queryCoursePackageLists(provinceCode, cityCode, coursePackageTypeId, storeIds, name, status, state);
return super.packForBT(mapPage);
}
@@ -906,9 +915,13 @@
coursePackage.setClassStartTime(firstString);
coursePackage.setClassEndTime(secondString);
- coursePackage.setAuditStatus(1);
coursePackage.setStatus(1);
coursePackage.setState(1);
+ if (UserExt.getUser().getObjectType() == 1){
+ coursePackage.setAuditStatus(2);
+ }else{
+ coursePackage.setAuditStatus(1);
+ }
coursePackage.setInsertTime(new Date());
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
@@ -920,6 +933,7 @@
coursePackage.setProvinceCode(store.getProvinceCode());
coursePackage.setCity(store.getCity());
coursePackage.setCityCode(store.getCityCode());
+ coursePackage.setAuditStatus(1);
}
@@ -970,6 +984,10 @@
// classEndTime = classEndTime.substring(0, classEndTime.lastIndexOf(":"));
coursePackage.setClassStartTime(firstString);
coursePackage.setClassEndTime(secondString);
+ coursePackage.setAuditStatus(2);
+ if (UserExt.getUser().getObjectType() != 1){
+ coursePackage.setAuditStatus(1);
+ }
coursePackageService.updateCoursePackage(coursePackage, coursePackagePaymentConfig);
return ResultUtil.success();
}
--
Gitblit v1.7.1