From 78a4df6ad36a5cdf18d40ef539e0ce9609c71b4f Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期六, 07 十月 2023 15:33:28 +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 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 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 b29cf19..58cef35 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,6 +16,7 @@
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;
@@ -556,6 +557,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("周一", "周二", "周三", "周四", "周五", "周六", "周日");
@@ -587,11 +593,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";
}
@@ -606,6 +614,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;
@@ -613,7 +622,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);
}
@@ -626,7 +652,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);
}
/**
@@ -637,7 +684,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;
}
--
Gitblit v1.7.1