From c697ed09cb1e257bc54603213b304e0f156326a6 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 02 十一月 2023 10:34:07 +0800
Subject: [PATCH] 支付会员送券功能补充 运营商权限bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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..8459e35 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
@@ -835,15 +836,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 +913,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();
--
Gitblit v1.7.1