From d22e7172537d9a658e83dbe76bb267c7611642c1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 11 三月 2024 17:02:28 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 62 ++++++++++++++++++++++++++-----
1 files changed, 52 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 8db1499..5034ad5 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
@@ -289,6 +289,12 @@
System.out.println("=========coursePackagePaymentConfig=============>" + coursePackagePaymentConfig);
// model.addAttribute("couponIds", "3,2");
}
+
+
+ Integer able = coursePackageClient.queryAble(id);
+
+ model.addAttribute("able",able);
+
return PREFIX + "coursePackage_edit.html";
}
@@ -430,7 +436,7 @@
if (tCoursePackageDiscounts.size()>0){
TCoursePackageDiscount tCoursePackageDiscount = tCoursePackageDiscounts.get(0);
model.addAttribute("audit",tCoursePackageDiscount.getAuditStatus());
- StringBuilder stringBuilder = new StringBuilder("");
+ StringBuilder stringBuilder = new StringBuilder(" ");
// 如果折扣未通过
if (tCoursePackageDiscount.getAuditStatus() == 3){
model.addAttribute("state","未通过");
@@ -734,8 +740,9 @@
@ResponseBody
- @PostMapping("/queryCity1/{code}")
- public ResultUtil queryCity1(@PathVariable("code") String code){
+ @PostMapping("/queryCity1/{code}/{$operationId}")
+ public ResultUtil queryCity1(@PathVariable("code") String code,
+ @PathVariable("$operationId") String operationId){
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
String cityCode = null;
@@ -743,9 +750,18 @@
// CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
// cityCode = cityManager.getCityCode();
// }
- System.out.println("======="+storeService.queryCity(code, cityCode));
+ Integer operatorId= 0;
+ Integer type= 0;
+ if (operationId.equals("平台")){
+ type = 1;
+ operatorId = null;
+ }else{
+ operatorId = Integer.valueOf(operationId);
+ type = 2;
+ }
// return storeService.queryCity(code, cityCode);
- return new ResultUtil(0,null,null,storeService.queryCity(code, cityCode),null);
+ return new ResultUtil(0,null,null,storeService.queryCity2(code, cityCode
+ ,type,operatorId),null);
}
@ResponseBody
@@ -848,6 +864,31 @@
public List<TSite> querySite(@PathVariable("id") Integer storeId){
System.out.println("==storeId==="+storeId);
List<TSite> list = siteService.list(new QueryWrapper<TSite>().select("id","name").eq("storeId", storeId).eq("state", 1));
+ return list;
+ }
+ /**
+ * 根据门店id获取场地
+ * @param storeId
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/querySite1")
+ public List<TSite> querySite1(Integer storeId,Integer type){
+ List<TSite> list = new ArrayList<>();
+ if (type==1){
+ list = siteService.list(new QueryWrapper<TSite>()
+ .select("id","name")
+ .eq("storeId", storeId)
+ .eq("state", 1)
+ .eq("ishalf",type));
+ }else{
+ list = siteService.list(new QueryWrapper<TSite>()
+ .select("id","name")
+ .eq("storeId", storeId)
+ .eq("state", 1)
+ );
+ }
+
return list;
}
@@ -1033,16 +1074,17 @@
@ResponseBody
@PostMapping("/updateCoursePackage")
public ResultUtil updateCoursePackage(TCoursePackage coursePackage, String coursePackagePaymentConfig){
-
// System.out.println("=======getClassStartTime============"+classStartTime);
String startTime = coursePackage.getClassStartTime();
- JSONArray jsonArray = JSON.parseArray(startTime);
+ String s = startTime.replaceAll(" ", "");
+
+ JSONArray jsonArray = JSON.parseArray(s);
System.out.println("=======jsonArray==========="+jsonArray);
List<String> first = new ArrayList<>();
List<String> second = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
-// JSONObject jsonObject = JSON.parseObject(jsonArray.getString(i));
+// JSONObject jsonObject = JSON.parseObject(jsonArray.getString(i));
String jsonString = jsonArray.getString(i);
String[] split = jsonString.split("-");
@@ -1094,7 +1136,7 @@
public ResultUtil editCoursePackageState1(Integer id, Integer state){
TCoursePackage coursePackage = new TCoursePackage();
coursePackage.setId(id);
- coursePackage.setStatus(state);
+ coursePackage.setState(state);
coursePackageService.editCoursePackageState(coursePackage);
return ResultUtil.success();
}
@@ -1266,7 +1308,7 @@
*/
@ResponseBody
@PostMapping("/makeUpMissedLessons")
- public ResultUtil makeUpMissedLessons(Long id){
+ public ResultUtil makeUpMissedLessons(Integer id){
System.out.println("==========coursePackage补课PaymentId======"+id);
return coursePackageService.makeUpMissedLessons(id);
}
--
Gitblit v1.7.1