From 232d3efb20f87f9c60faeda7bae4bc96e5687bd3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 19:19:47 +0800
Subject: [PATCH] 10.12
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 320 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 292 insertions(+), 28 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 68e7007..ae08367 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
@@ -16,17 +16,22 @@
import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.model.TSite;
import com.dsh.guns.modular.system.model.TStore;
+import com.dsh.guns.modular.system.model.dto.SelectDto;
import com.dsh.guns.modular.system.service.ICoursePackageService;
import com.dsh.guns.modular.system.service.IStoreService;
import com.dsh.guns.modular.system.service.ITSiteService;
import com.dsh.guns.modular.system.util.ResultUtil;
import io.swagger.models.auth.In;
+import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -69,7 +74,27 @@
-
+ /**
+ * 根据门店获取课程
+ */
+ @ResponseBody
+ @RequestMapping("/getCoursePackageByStoreId")
+ public List<TCoursePackageType> getCoursePackageByStoreId(Integer storeId){
+ List<TCoursePackage> list = coursePackageClient.getCoursePackageByStoreId(storeId);
+ List<Integer> ids = new ArrayList<>();
+ for (TCoursePackage tCoursePackage : list) {
+ ids.add(tCoursePackage.getCoursePackageTypeId());
+ }
+ return coursePackageTypeClient.getByCourseIds(ids);
+ }
+ /**
+ * 根据课包类型获取课包
+ */
+ @ResponseBody
+ @RequestMapping("/getCoursePackageByType")
+ public List<TCoursePackage> getCoursePackageByType(Integer storeId){
+ return coursePackageClient.getCoursePackageByType(storeId);
+ }
/**
* 跳转到列表页
* @param model
@@ -123,7 +148,9 @@
List<Coach> coaches = coachClient.queryCoachByCity(code1);
model.addAttribute("coach", coaches);
-// System.out.println("========type========"+type);
+
+ model.addAttribute("type",type);
+ System.out.println("========type========"+type);
// if (type ==1){
// return PREFIX + "coursePackage_edit.html";
// }
@@ -141,6 +168,36 @@
public String openEditCoursePackage(Model model, Integer id){
TCoursePackage tCoursePackage = coursePackageService.queryById(id);
model.addAttribute("item", tCoursePackage);
+ model.addAttribute("type", tCoursePackage.getType());
+
+ String classStartTime = tCoursePackage.getClassStartTime();
+ String classEndTime = tCoursePackage.getClassEndTime();
+
+ if (tCoursePackage.getStartTime()!=null) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String dateString = sdf.format(tCoursePackage.getStartTime());
+ String dateString1 = sdf.format(tCoursePackage.getEndTime());
+ model.addAttribute("holi", dateString + " - " + dateString1);
+ }
+ String[] split1 = classStartTime.split(",");
+ String[] split2 = classEndTime.split(",");
+
+ List<String> listtime = new ArrayList<>();
+
+ for (int i = 0; i < split1.length; i++) {
+ String o = split1[i]+"-"+split2[i];
+ listtime.add(o);
+ }
+
+
+ model.addAttribute("time1",listtime.remove(0));
+ if (listtime.size()!=0) {
+ model.addAttribute("times", listtime);
+ }
+
+
+
+
model.addAttribute("classTime", tCoursePackage.getClassStartTime() + ":00 - " + tCoursePackage.getClassEndTime() + ":00");
String[] split = tCoursePackage.getClassWeeks().split(";");
List<String> list5 = Arrays.asList("周一", "周二", "周三", "周四", "周五", "周六", "周日");
@@ -172,17 +229,29 @@
List<Coach> coaches = coachClient.queryCoachByCity(cityCode);
model.addAttribute("coach", coaches);
List<CoursePackagePaymentConfig> list4 = coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(id);
+
+
System.out.println("========couponIds=========>"+list4.get(0).getCouponIds());
+
+ model.addAttribute("cashPayment", list4.get(0).getCashPayment() == 0 ? false : true);
+ model.addAttribute("playPaiCoin", list4.get(0).getPlayPaiCoin() == 0 ? false : true);
+
model.addAttribute("couponIds", list4.get(0).getCouponIds());
model.addAttribute("coursePackagePaymentConfig", list4.remove(0));
+ for (int i = 0; i < list4.size(); i++) {
+ list4.get(i).setId(i+2);
+ }
+
model.addAttribute("coursePackagePaymentConfigs", list4);
+ model.addAttribute("index", 1);
+ if (list4.size()!=0) {
CoursePackagePaymentConfig coursePackagePaymentConfig = list4.get(0);
-// if (list4.size()!=0) {
+
model.addAttribute("cashPayment", coursePackagePaymentConfig.getCashPayment() == 0 ? false : true);
model.addAttribute("playPaiCoin", coursePackagePaymentConfig.getPlayPaiCoin() == 0 ? false : true);
System.out.println("=========coursePackagePaymentConfig=============>" + coursePackagePaymentConfig);
// model.addAttribute("couponIds", "3,2");
-// }
+ }
return PREFIX + "coursePackage_edit.html";
}
@@ -197,6 +266,36 @@
public String showCoursePackageDetails(Model model, Integer id){
TCoursePackage tCoursePackage = coursePackageService.queryById(id);
model.addAttribute("item", tCoursePackage);
+ model.addAttribute("type", tCoursePackage.getType());
+
+ String classStartTime = tCoursePackage.getClassStartTime();
+ String classEndTime = tCoursePackage.getClassEndTime();
+
+ if (tCoursePackage.getStartTime()!=null) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String dateString = sdf.format(tCoursePackage.getStartTime());
+ String dateString1 = sdf.format(tCoursePackage.getEndTime());
+ model.addAttribute("holi", dateString + " - " + dateString1);
+ }
+ String[] split1 = classStartTime.split(",");
+ String[] split2 = classEndTime.split(",");
+
+ List<String> listtime = new ArrayList<>();
+
+ for (int i = 0; i < split1.length; i++) {
+ String o = split1[i]+"-"+split2[i];
+ listtime.add(o);
+ }
+
+
+ model.addAttribute("time1",listtime.remove(0));
+ if (listtime.size()!=0) {
+ model.addAttribute("times", listtime);
+ }
+
+
+
+
model.addAttribute("classTime", tCoursePackage.getClassStartTime() + ":00 - " + tCoursePackage.getClassEndTime() + ":00");
String[] split = tCoursePackage.getClassWeeks().split(";");
List<String> list5 = Arrays.asList("周一", "周二", "周三", "周四", "周五", "周六", "周日");
@@ -228,12 +327,29 @@
List<Coach> coaches = coachClient.queryCoachByCity(cityCode);
model.addAttribute("coach", coaches);
List<CoursePackagePaymentConfig> list4 = coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(id);
+
+
+ System.out.println("========couponIds=========>"+list4.get(0).getCouponIds());
+
+ model.addAttribute("cashPayment", list4.get(0).getCashPayment() == 0 ? false : true);
+ model.addAttribute("playPaiCoin", list4.get(0).getPlayPaiCoin() == 0 ? false : true);
+
+ model.addAttribute("couponIds", list4.get(0).getCouponIds());
model.addAttribute("coursePackagePaymentConfig", list4.remove(0));
+ for (int i = 0; i < list4.size(); i++) {
+ list4.get(i).setId(i+2);
+ }
+
model.addAttribute("coursePackagePaymentConfigs", list4);
- CoursePackagePaymentConfig coursePackagePaymentConfig = list4.get(0);
- model.addAttribute("cashPayment", coursePackagePaymentConfig.getCashPayment() == 0 ? false : true);
- model.addAttribute("playPaiCoin", coursePackagePaymentConfig.getPlayPaiCoin() == 0 ? false : true);
-// model.addAttribute("couponIds", coursePackagePaymentConfig.getCouponIds());
+ model.addAttribute("index", 1);
+ if (list4.size()!=0) {
+ CoursePackagePaymentConfig coursePackagePaymentConfig = list4.get(0);
+
+ model.addAttribute("cashPayment", coursePackagePaymentConfig.getCashPayment() == 0 ? false : true);
+ model.addAttribute("playPaiCoin", coursePackagePaymentConfig.getPlayPaiCoin() == 0 ? false : true);
+ System.out.println("=========coursePackagePaymentConfig=============>" + coursePackagePaymentConfig);
+// model.addAttribute("couponIds", "3,2");
+ }
return PREFIX + "coursePackage_info.html";
}
@@ -293,7 +409,12 @@
model.addAttribute("index",id);
model.addAttribute("conpund",conpunids);
- return PREFIX + "TCouponEdit.html";
+
+ if (conpunids!=null){
+ return PREFIX + "TCoupon1.html";
+ }
+
+ return PREFIX + "TCoupon.html";
}
/**
@@ -303,10 +424,19 @@
* @return
*/
@GetMapping("/registrationRecord")
- public String registrationRecord(Model model, Integer id){
+ public String registrationRecord(Model model, Integer id,Integer type){
TCoursePackage tCoursePackage = coursePackageService.queryById(id);
model.addAttribute("item", tCoursePackage);
- return PREFIX + "registrationRecord.html";
+ model.addAttribute("type", type);
+ if (type ==1){
+ return PREFIX + "registrationRecord.html";}
+ if (type == 2){
+ return PREFIX + "registrationRecord2.html";
+ }
+ if (type == 3){
+ return PREFIX + "registrationRecord3.html";
+ }
+ return "registrationRecord.html";
}
@@ -341,7 +471,39 @@
model.addAttribute("times", strings);
model.addAttribute("counts", counts);
+
return PREFIX + "classRecord.html";
+ }
+
+ /**
+ * 假期跳转到上课记录列表页
+ * @param model
+ * @param id
+ * @return
+ */
+ @GetMapping("/openClassRecord1")
+ public String openClassRecord1(Model model, Integer id){
+ TCoursePackage tCoursePackage = coursePackageClient.queryById(id);
+ String[] start = tCoursePackage.getClassStartTime().split(",");
+ String[] end = tCoursePackage.getClassEndTime().split(",");
+ Integer counts = packagePaymentClient.queryByClassId(id);
+
+
+ List<String> strings = new ArrayList<>();
+ for (int i = 0; i <start.length ; i++) {
+ String outTime = start[i] +"-" +end[0];
+ strings.add(outTime);
+ }
+
+ TStore store = storeService.getById(tCoursePackage.getStoreId());
+ Coach coach = coachClient.queryCoachById(tCoursePackage.getCoachId());
+ model.addAttribute("item", tCoursePackage);
+ model.addAttribute("store", store);
+ model.addAttribute("coach", coach);
+ model.addAttribute("times", strings);
+ model.addAttribute("counts", counts);
+
+ return PREFIX + "classRecord2.html";
}
@@ -385,6 +547,16 @@
}
+ @GetMapping("/queryProvince")
+ @ResponseBody
+ public List<Map<String, Object>> queryProvince(){
+
+ List<Map<String, Object>> list = storeService.queryProvince(null);
+
+ return list;
+ }
+
+
/**
* 跳转到审核详情页
* @param model
@@ -395,6 +567,11 @@
public String showExamineCoursePackageDetails(Model model, Integer id){
TCoursePackage tCoursePackage = coursePackageService.queryById(id);
model.addAttribute("item", tCoursePackage);
+ System.out.println("============"+ tCoursePackage.getAuditStatus());
+ model.addAttribute("auditStatus", tCoursePackage.getAuditStatus());
+
+ model.addAttribute("authRemark", tCoursePackage.getAuthRemark());
+
model.addAttribute("classTime", tCoursePackage.getClassStartTime() + ":00 - " + tCoursePackage.getClassEndTime() + ":00");
String[] split = tCoursePackage.getClassWeeks().split(";");
List<String> list5 = Arrays.asList("周一", "周二", "周三", "周四", "周五", "周六", "周日");
@@ -426,11 +603,13 @@
List<Coach> coaches = coachClient.queryCoachByCity(cityCode);
model.addAttribute("coach", coaches);
List<CoursePackagePaymentConfig> list4 = coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(id);
+ if(list4.size()!=0){
+ CoursePackagePaymentConfig coursePackagePaymentConfig = list4.get(0);
+ model.addAttribute("cashPayment", coursePackagePaymentConfig.getCashPayment() == 0 ? false : true);
+ model.addAttribute("playPaiCoin", coursePackagePaymentConfig.getPlayPaiCoin() == 0 ? false : true);}
model.addAttribute("coursePackagePaymentConfig", list4.remove(0));
model.addAttribute("coursePackagePaymentConfigs", list4);
- CoursePackagePaymentConfig coursePackagePaymentConfig = list4.get(0);
- model.addAttribute("cashPayment", coursePackagePaymentConfig.getCashPayment() == 0 ? false : true);
- model.addAttribute("playPaiCoin", coursePackagePaymentConfig.getPlayPaiCoin() == 0 ? false : true);
+
return PREFIX + "examineCoursePackage_info.html";
}
@@ -445,6 +624,7 @@
@ResponseBody
@PostMapping("/queryCity")
public List<Map<String, Object>> queryCity(String code){
+
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
String cityCode = null;
@@ -452,7 +632,24 @@
CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
cityCode = cityManager.getCityCode();
}
+ System.out.println("======="+storeService.queryCity(code, cityCode));
return storeService.queryCity(code, cityCode);
+ }
+
+
+ @ResponseBody
+ @PostMapping("/queryCity1/{code}")
+ public ResultUtil queryCity1(@PathVariable("code") String code){
+ Integer objectType = UserExt.getUser().getObjectType();
+ Integer objectId = UserExt.getUser().getObjectId();
+ String cityCode = null;
+ if(objectType == 2){//城市管理员
+ CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
+ cityCode = cityManager.getCityCode();
+ }
+ System.out.println("======="+storeService.queryCity(code, cityCode));
+// return storeService.queryCity(code, cityCode);
+ return new ResultUtil(0,null,null,storeService.queryCity(code, cityCode),null);
}
@@ -465,7 +662,28 @@
@PostMapping("/queryStore")
public List<TStore> queryStore(String cityCode){
List<TStore> list = storeService.list(new QueryWrapper<TStore>().eq("cityCode", cityCode).eq("state", 1));
+ System.out.println("====list="+list);
return list;
+ }
+
+
+ @ResponseBody
+ @PostMapping("/queryStore1/{cityCode}")
+ public ResultUtil queryStore1(@PathVariable("cityCode") String cityCode){
+ List<TStore> list = storeService.list(new QueryWrapper<TStore>().select("id","name").eq("cityCode", cityCode).eq("state", 1));
+// Map<String,Integer> map = new LinkedHashMap<>();
+ List<SelectDto> selectDtos = new ArrayList<>();
+ Map<String,Integer> map = new HashMap<>();
+// for (TStore store : list) {
+// SelectDto selectDto = new SelectDto();
+// selectDto.setId(Long.valueOf(store.getId()));
+// selectDto.setValue(store.getName());
+// selectDtos.add(selectDto);
+//
+// }
+// map.put("options",selectDtos);
+
+ return new ResultUtil(0,0,null,list,null);
}
/**
@@ -476,7 +694,8 @@
@ResponseBody
@PostMapping("/querySite")
public List<TSite> querySite(Integer storeId){
- List<TSite> list = siteService.list(new QueryWrapper<TSite>().eq("storeId", storeId).eq("state", 1));
+ System.out.println("==storeId==="+storeId);
+ List<TSite> list = siteService.list(new QueryWrapper<TSite>().select("id","name").eq("storeId", storeId).eq("state", 1));
return list;
}
@@ -531,9 +750,24 @@
*/
@ResponseBody
@PostMapping("/addCoursePackage")
- public ResultUtil addCoursePackage(TCoursePackage coursePackage, String coursePackagePaymentConfig){
+ public ResultUtil addCoursePackage(TCoursePackage coursePackage, String coursePackagePaymentConfig) throws ParseException {
String classStartTime = coursePackage.getClassStartTime();
// String classEndTime = coursePackage.getClassEndTime();
+ Date startDate = null;
+ Date endDate =null ;
+
+ String holitime = coursePackage.getHolitime();
+ if (holitime!=null&&holitime!="") {
+ String[] dateParts = holitime.split(" - ");
+ String startDateString = dateParts[0];
+ String endDateString = dateParts[1];
+
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ startDate = dateFormat.parse(startDateString);
+ endDate = dateFormat.parse(endDateString);
+
+ }
+
System.out.println("=======getClassStartTime============"+classStartTime);
String startTime = coursePackage.getClassStartTime();
@@ -546,10 +780,11 @@
// JSONObject jsonObject = JSON.parseObject(jsonArray.getString(i));
String jsonString = jsonArray.getString(i);
- String[] split = jsonString.split("-");
+ String[] split = jsonString.split(" - ");
first.add(split[0]);
- second.add(split[1]);
-
+ if (split.length>1) {
+ second.add(split[1]);
+ }
}
String firstString = String.join(",",first);
String secondString = String.join(",",second);
@@ -558,6 +793,10 @@
System.out.println("=========secondString========>"+secondString);
// classStartTime = classStartTime.substring(0, classStartTime.lastIndexOf(":"));
// classEndTime = classEndTime.substring(0, classEndTime.lastIndexOf(":"));
+
+ coursePackage.setStartTime(startDate);
+ coursePackage.setEndTime(endDate);
+
coursePackage.setClassStartTime(firstString);
coursePackage.setClassEndTime(secondString);
coursePackage.setAuditStatus(1);
@@ -578,12 +817,36 @@
@ResponseBody
@PostMapping("/updateCoursePackage")
public ResultUtil updateCoursePackage(TCoursePackage coursePackage, String coursePackagePaymentConfig){
- String classStartTime = coursePackage.getClassStartTime();
- String classEndTime = coursePackage.getClassEndTime();
- classStartTime = classStartTime.substring(0, classStartTime.lastIndexOf(":"));
- classEndTime = classEndTime.substring(0, classEndTime.lastIndexOf(":"));
- coursePackage.setClassStartTime(classStartTime);
- coursePackage.setClassEndTime(classEndTime);
+
+// System.out.println("=======getClassStartTime============"+classStartTime);
+ String startTime = coursePackage.getClassStartTime();
+ JSONArray jsonArray = JSON.parseArray(startTime);
+ 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));
+
+ String jsonString = jsonArray.getString(i);
+ String[] split = jsonString.split("-");
+ System.out.println("============"+split);
+ if (split.length>1){
+ first.add(split[0]);
+ second.add(split[1]);}
+
+ }
+ String firstString = String.join(",",first);
+ String secondString = String.join(",",second);
+ System.out.println("=========firstString========>"+firstString);
+
+ System.out.println("=========secondString========>"+secondString);
+// String classStartTime = coursePackage.getClassStartTime();
+// String classEndTime = coursePackage.getClassEndTime();
+// classStartTime = classStartTime.substring(0, classStartTime.lastIndexOf(":"));
+// classEndTime = classEndTime.substring(0, classEndTime.lastIndexOf(":"));
+ coursePackage.setClassStartTime(firstString);
+ coursePackage.setClassEndTime(secondString);
coursePackageService.updateCoursePackage(coursePackage, coursePackagePaymentConfig);
return ResultUtil.success();
}
@@ -768,13 +1031,14 @@
/**
* 补课操作
- * @param coursePackagePaymentId
+ * @param id
* @return
*/
@ResponseBody
@PostMapping("/makeUpMissedLessons")
- public ResultUtil makeUpMissedLessons(Long coursePackagePaymentId){
- return coursePackageService.makeUpMissedLessons(coursePackagePaymentId);
+ public ResultUtil makeUpMissedLessons(Long id){
+ System.out.println("==========coursePackage补课PaymentId======"+id);
+ return coursePackageService.makeUpMissedLessons(id);
}
--
Gitblit v1.7.1