From a1e80d905fd38f6ead484396b788fe19b0a3d7d5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:13 +0800
Subject: [PATCH] 修改bug
---
cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java | 3
cloud-server-course/src/main/java/com/dsh/course/feignclient/account/AppUserClient.java | 3
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java | 3
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 21 ++-
cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml | 52 +++-----
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java | 9 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html | 9 +
cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java | 6
cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/operatorIncome.html | 8 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 4
cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java | 16 +
cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml | 2
cloud-server-management/src/main/webapp/WEB-INF/view/login.html | 6
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 9 +
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 164 +++++++++++++++++----------
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 4
16 files changed, 201 insertions(+), 118 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index a4b4137..d40d094 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -600,4 +600,13 @@
System.out.println("=======selectDtos======>" + selectDtos);
return selectDtos;
}
+
+
+ @PostMapping("/appUser/queryAppUserByCityCode")
+ public List<TAppUser> queryAppUserByCityCode(@RequestBody String cityCode){
+ return appUserService.list(new QueryWrapper<TAppUser>()
+ .eq("state", 1)
+ .eq("cityCode", cityCode)
+ );
+ }
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java
index a17e78b..53b18ea 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java
@@ -30,7 +30,8 @@
@Override
public List<PointMerchandiseIncomeVo> getAmount() {
- return userPointsMerchandiseMapper.getAmount();
+ List<PointMerchandiseIncomeVo> amount = userPointsMerchandiseMapper.getAmount();
+ return amount;
}
@Override
diff --git a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
index 6c653cc..df2bff7 100644
--- a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
@@ -18,7 +18,7 @@
<select id="getAmount" resultType="com.dsh.activity.model.PointMerchandiseIncomeVo">
- select t1.*,t2.cash from t_user_points_merchandise t1
+ select t1.insertTime,t2.cash from t_user_points_merchandise t1
left join t_points_merchandise t2 on t1.pointsMerchandiseId = t2.id
where t1.payStatus =2
</select>
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index 822cac7..9c618e6 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -180,6 +180,7 @@
coursePackageOrder.setStudentIds(String.valueOf(packagePayment.getStudentId()));
coursePackageOrder.setCoursePackageId(packagePayment.getCoursePackageId());
coursePackageOrder.setClassHours(packagePayment.getClassHours());
+ coursePackageOrder.setLaveClassHours(packagePayment.getClassHours());
coursePackageOrder.setOriginalPrice(packagePayment.getOriginalPrice());
coursePackageOrder.setCashPayment(packagePayment.getCashPayment());
coursePackageOrder.setPlayPaiCoin(packagePayment.getPlayPaiCoin());
@@ -246,7 +247,7 @@
coursePackageOrderStudentService.saveOrUpdate(coursePackageOrderStudent);
Integer studentId = Integer.valueOf(byId1.getStudentIds());
//开始排课
- addPackageStudent1(byId, byId1.getAppUserId(), studentId, coursePackageOrderStudent);
+ addPackageStudent1(byId, byId1.getAppUserId(), studentId, byId1, coursePackageOrderStudent);
} else {
Date useTime = coursePackageOrderStudent.getUseTime();
coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + byId1.getClassHours());
@@ -279,12 +280,12 @@
Integer studentId = Integer.valueOf(byId1.getStudentIds());
//中间断课，没有连续续费的情况需要重新排课
if (useTime.compareTo(new Date()) < 0) {
- addPackageStudent1(byId, byId1.getAppUserId(), studentId, coursePackageOrderStudent);
+ addPackageStudent1(byId, byId1.getAppUserId(), studentId, byId1, coursePackageOrderStudent);
}
}
}
if(byId.getType() == 2){
- addPackageStudent1(byId, byId1.getAppUserId(), Integer.valueOf(byId1.getStudentIds()), null);
+ addPackageStudent1(byId, byId1.getAppUserId(), Integer.valueOf(byId1.getStudentIds()), byId1, null);
}
return packagePaymentService.changeState(dto);
}
@@ -1728,7 +1729,7 @@
if (student != null) {
sId = student.getId();
}
- addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePayment.getId());
+ addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePayment, coursePackagePayment.getId());
CourseCounsum courseCounsum = new CourseCounsum();
@@ -1751,7 +1752,7 @@
if (student != null) {
sId = student.getId();
}
- addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePaymentServiceOne.getId());
+ addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePaymentServiceOne, coursePackagePaymentServiceOne.getId());
CourseCounsum courseCounsum = new CourseCounsum();
@@ -1901,7 +1902,8 @@
@Autowired
private TCoursePackageService coursePackageService;
- private void addPackageStudent1(TCoursePackage tCoursePackage, Integer userId, Integer sId, CoursePackageOrderStudent coursePackageOrderStudent) {
+
+ private void addPackageStudent1(TCoursePackage tCoursePackage, Integer userId, Integer sId, CoursePackageOrder coursePackageOrder, CoursePackageOrderStudent coursePackageOrderStudent) {
try {
//1常规 2假期 3体验
if (tCoursePackage.getType() == 1) {
@@ -1958,6 +1960,7 @@
coursePackageScheduling.setAppUserId(userId);
coursePackageScheduling.setStudentId(sId);
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackagePaymentIds(coursePackageOrder.getId().toString());
Date parse = format1.parse(format.format(time) + " " + split[j]);
Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
coursePackageScheduling.setClassDate(parse);
@@ -2018,6 +2021,7 @@
coursePackageScheduling.setAppUserId(userId);
coursePackageScheduling.setStudentId(sId);
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackagePaymentIds(coursePackageOrder.getId().toString());
Date parse = format1.parse(format.format(time) + " " + split[j]);
Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
coursePackageScheduling.setClassDate(parse);
@@ -2043,7 +2047,7 @@
e.printStackTrace();
}
}
- private void addPackageStudent(Integer courseId, Integer userId, Integer sId, Long paymentId) throws ParseException {
+ private void addPackageStudent(Integer courseId, Integer userId, Integer sId, TCoursePackagePayment coursePackagePayment, Long paymentId) throws ParseException {
// 课包
TCoursePackage tCoursePackage = coursePackageService.getById(courseId);
@@ -2094,6 +2098,7 @@
}
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackagePaymentIds(coursePackagePayment.getId().toString());
Date parse = format1.parse(format.format(date) + " " + split[i1]);
Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);
coursePackageScheduling.setClassDate(parse);
@@ -2157,6 +2162,7 @@
}
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackagePaymentIds(coursePackagePayment.getId().toString());
Date parse = format1.parse(format.format(date) + " " + split[i1]);
Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);
coursePackageScheduling.setClassDate(parse);
@@ -2269,6 +2275,7 @@
}
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackagePaymentIds(pay.getId().toString());
Date parse = format1.parse(format.format(date) + " " + split[i1]);
Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);
coursePackageScheduling.setClassDate(parse);
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
index 93d5fdf..4d355e3 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
@@ -67,10 +67,7 @@
@RequestMapping("/getStudentTotal")
@ResponseBody
public List<Map<String, Object>> get(@RequestBody StudentQeryDto studentQeryDto) {
- System.out.println("-====studentQeryDto=========" + studentQeryDto);
List<Map<String, Object>> pays = paymentService.getStudentTotal(studentQeryDto);
- System.out.println("=========pays======" + pays);
-
return pays;
}
@@ -691,6 +688,7 @@
coursePackageScheduling.setAppUserId(userId);
coursePackageScheduling.setStudentId(sId);
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackagePaymentId();
Date parse = format1.parse(format.format(time) + " " + split[j]);
Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
coursePackageScheduling.setClassDate(parse);
@@ -751,6 +749,7 @@
coursePackageScheduling.setAppUserId(userId);
coursePackageScheduling.setStudentId(sId);
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackagePaymentId();
Date parse = format1.parse(format.format(time) + " " + split[j]);
Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
coursePackageScheduling.setClassDate(parse);
@@ -880,6 +879,7 @@
coursePackageScheduling.setAppUserId(student.getAppUserId());
coursePackageScheduling.setStudentId(Integer.valueOf(stuId));
coursePackageScheduling.setCoursePackageId(coursePackage1.getId());
+ coursePackageScheduling.setCoursePackagePaymentId();
Date parse = format1.parse(format.format(time) + " " + split[j]);
Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
coursePackageScheduling.setClassDate(parse);
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/account/AppUserClient.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/account/AppUserClient.java
index ee97704..dbeb6fc 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/account/AppUserClient.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/account/AppUserClient.java
@@ -73,4 +73,7 @@
List<SelectDto> getSelects(List<Integer> studentIds);
+
+ @PostMapping("/appUser/queryAppUserByCityCode")
+ List<AppUser> queryAppUserByCityCode(String cityCode);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java b/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
index 7b7d109..b0faf43 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
@@ -76,7 +76,8 @@
void updateBytime(@Param("coursePackagePayment") TCoursePackagePayment coursePackagePayment);
- List<Map<String, Object>> getStudentTotal(StudentQeryDto studentQeryDto);
+ List<Map<String, Object>> getStudentTotal(@Param("appUserIds") List<Integer> appUserIds, @Param("start") String start,
+ @Param("end") String end);
List<Map<String, Object>> pacQueryDto(PacQueryDto pacQueryDto);
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java
index f94add7..42a3aad 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java
@@ -163,6 +163,15 @@
.gt("useTime", "now()")
.gt("laveClassHours", 0)
);
+
+ List<CoursePackageOrder> list1 = coursePackageOrderService.list(new QueryWrapper<CoursePackageOrder>()
+ .eq("payStatus", 2)
+ .eq("status", 1)
+ .eq("state", 1)
+ .gt("laveClassHours", 0)
+ .orderByAsc("insertTime")
+ );
+
for (CoursePackageOrderStudent coursePackageOrderStudent : list) {
CoursePackageScheduling coursePackageScheduling = this.getOne(new QueryWrapper<CoursePackageScheduling>()
.eq("appUserId", coursePackageOrderStudent.getAppUserId())
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index 5b5a589..a886a16 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -152,70 +152,110 @@
@Override
public List<Map<String, Object>> getStudentTotal(StudentQeryDto studentQeryDto) {
- List<Map<String, Object>> studentTotal = this.baseMapper.getStudentTotal(studentQeryDto);
+// String cityCode = studentQeryDto.getCityCode();
+// String start = studentQeryDto.getStart();
+// String end = studentQeryDto.getEnd();
+// //获取用户数据
+// List<Integer> appUserIds = null;
+// if(ToolUtil.isNotEmpty(cityCode)){
+// List<AppUser> appUsers = appuClient.queryAppUserByCityCode(cityCode);
+// if(appUsers.size() > 0){
+// appUserIds = appUsers.stream().map(AppUser::getId).collect(Collectors.toList());
+// }
+// }
+// QueryWrapper<CoursePackageStudent> status = new QueryWrapper<CoursePackageStudent>().eq("payStatus", 2).eq("status", 1);
+// if(null != appUserIds){
+// status.in("appUserId", appUserIds);
+// }
+// List<Map<String, Object>> maps = this.baseMapper.getStudentTotal(appUserIds, studentQeryDto.getStart(), studentQeryDto.getEnd());
+// List<Map<String, Object>> list = new ArrayList<>();
+// for (Map<String, Object> objectMap : maps) {
+// Integer studentId = Integer.valueOf(objectMap.get("studentId").toString());
+// Integer appUserId = Integer.valueOf(objectMap.get("appUserId").toString());
+// Integer coursePackageId = Integer.valueOf(objectMap.get("coursePackageId").toString());
+// Integer number = Integer.valueOf(objectMap.get("number").toString());
+// Map<String, Object> map = new HashMap<>();
+// Student student = studentClient.queryStudentById(studentId);
+// map.put("studentName", student.getName());
+// AppUser appUser = appuClient.queryAppUser(appUserId);
+// map.put("province", appUser.getProvince());
+// map.put("provinceCode", appUser.getProvinceCode());
+// map.put("city", appUser.getCity());
+// map.put("cityCode", appUser.getCityCode());
+// TCoursePackage coursePackage = coursePackageService.getById(coursePackageId);
+// map.put("courseName", coursePackage.getName());
+// map.put("totalClassHours", number);
+// map.put("cashPayment", coursePackageOrder.getCashPayment());
+// map.put("hasHours", )
+//
+//
+// }
- for (Map<String, Object> student : studentTotal) {
- Integer appUserId = (Integer) student.get("appUserId");
- AppUser appUser = appuClient.queryAppUser(appUserId);
- student.put("province", appUser.getProvince());
- student.put("provinceCode", appUser.getProvinceCode());
- student.put("city", appUser.getCity());
- student.put("cityCode", appUser.getCityCode());
-
- Student studentId = studentClient.queryStudentById((Integer) student.get("studentId"));
- student.put("studentName", studentId.getName());
- BigDecimal cashPayment = (BigDecimal) student.get("cashPayment");
- BigDecimal totalClassHours = (BigDecimal) student.get("totalClassHours");
- BigDecimal hasHours = (BigDecimal) student.get("hasHours");
- if (cashPayment == null) {
- continue;
- }
- if (totalClassHours.compareTo(BigDecimal.ZERO) == 0) {
- totalClassHours = totalClassHours.add(new BigDecimal("1"));
- }
- BigDecimal hasPayment = cashPayment.divide(totalClassHours, 2, RoundingMode.HALF_UP)
- .multiply(hasHours).setScale(2, RoundingMode.HALF_UP);
- student.put("hasPayment", hasPayment);
- }
-
- if (studentQeryDto.getCityCode() != null && studentQeryDto.getCityCode() != "") {
- String value = studentQeryDto.getCityCode();
- boolean allZeros = value.substring(value.length() - 4).endsWith("0000");
- System.out.println(allZeros); // Output: true
- if (allZeros) {
- Iterator<Map<String, Object>> iterator = studentTotal.iterator();
- while (iterator.hasNext()) {
- Map<String, Object> student = iterator.next();
- String cityCode = (String) student.get("provinceCode");
- if (!cityCode.equals(studentQeryDto.getCityCode())) {
- iterator.remove(); // Remove the element from the list
- }
- }
- } else {
- Iterator<Map<String, Object>> iterator = studentTotal.iterator();
- while (iterator.hasNext()) {
- Map<String, Object> student = iterator.next();
- String cityCode = (String) student.get("cityCode");
- if (!cityCode.equals(studentQeryDto.getCityCode())) {
- iterator.remove(); // Remove the element from the list
- }
- }
- }
- }
-
- if (studentQeryDto.getStudentName() != null && studentQeryDto.getStudentName() != "") {
- List<Map<String, Object>> totallike = new ArrayList<>();
- for (Map<String, Object> student : studentTotal) {
- String studentName = (String) student.get("studentName");
- if (studentName.contains(studentQeryDto.getStudentName())) {
- totallike.add(student);
- }
-
- }
- return totallike;
- }
- return studentTotal;
+// List<Map<String, Object>> studentTotal = this.baseMapper.getStudentTotal(studentQeryDto);
+// for (Map<String, Object> student : studentTotal) {
+// Integer appUserId = (Integer) student.get("appUserId");
+// AppUser appUser = appuClient.queryAppUser(appUserId);
+// student.put("province", appUser.getProvince());
+// student.put("provinceCode", appUser.getProvinceCode());
+//
+// student.put("city", appUser.getCity());
+// student.put("cityCode", appUser.getCityCode());
+//
+// Student studentId = studentClient.queryStudentById((Integer) student.get("studentId"));
+// student.put("studentName", studentId.getName());
+// BigDecimal cashPayment = (BigDecimal) student.get("cashPayment");
+// BigDecimal totalClassHours = (BigDecimal) student.get("totalClassHours");
+// BigDecimal hasHours = (BigDecimal) student.get("hasHours");
+// if (cashPayment == null) {
+// continue;
+// }
+// if (totalClassHours.compareTo(BigDecimal.ZERO) == 0) {
+// totalClassHours = totalClassHours.add(new BigDecimal("1"));
+// }
+// BigDecimal hasPayment = cashPayment.divide(totalClassHours, 2, RoundingMode.HALF_UP)
+// .multiply(hasHours).setScale(2, RoundingMode.HALF_UP);
+// student.put("hasPayment", hasPayment);
+// }
+//
+// if (studentQeryDto.getCityCode() != null && studentQeryDto.getCityCode() != "") {
+// String value = studentQeryDto.getCityCode();
+// boolean allZeros = value.substring(value.length() - 4).endsWith("0000");
+// System.out.println(allZeros); // Output: true
+// if (allZeros) {
+// Iterator<Map<String, Object>> iterator = studentTotal.iterator();
+// while (iterator.hasNext()) {
+// Map<String, Object> student = iterator.next();
+// String cityCode = (String) student.get("provinceCode");
+// if (!cityCode.equals(studentQeryDto.getCityCode())) {
+// iterator.remove(); // Remove the element from the list
+// }
+// }
+// } else {
+// Iterator<Map<String, Object>> iterator = studentTotal.iterator();
+// while (iterator.hasNext()) {
+// Map<String, Object> student = iterator.next();
+// String cityCode = (String) student.get("cityCode");
+// if (!cityCode.equals(studentQeryDto.getCityCode())) {
+// iterator.remove(); // Remove the element from the list
+// }
+// }
+// }
+// }
+//
+// if (studentQeryDto.getStudentName() != null && studentQeryDto.getStudentName() != "") {
+// List<Map<String, Object>> totallike = new ArrayList<>();
+// for (Map<String, Object> student : studentTotal) {
+// String studentName = (String) student.get("studentName");
+// if (studentName.contains(studentQeryDto.getStudentName())) {
+// totallike.add(student);
+// }
+//
+// }
+// return totallike;
+// }
+// return studentTotal;
+ return null;
}
@Override
diff --git a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
index b70297c..1024ba2 100644
--- a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
@@ -165,38 +165,30 @@
</select>
<select id="getStudentTotal" resultType="map">
- SELECT * from(
- SELECT studentId, totalClassHours, name as courseName, laveClassHours,cashPayment as
- cashPayment,hasHours,appUserId,insertTime
- ,coursePackageId
- FROM (
- SELECT studentId, totalClassHours, name, laveClassHours,cashPayment, (totalClassHours - laveClassHours) AS
- hasHours,py.appUserId,py.insertTime
- ,coursePackageId
- FROM t_course_package_payment py
- LEFT JOIN t_course_package cp ON py.coursePackageId = cp.id
- UNION ALL
- SELECT studentId, SUM(totalClassHours) AS totalClassHours,'总计' as name, SUM(laveClassHours) AS laveClassHours,
- SUM(cashPayment) AS cashPayment,
- (SUM(totalClassHours) - SUM(laveClassHours)) AS hasHours,py.appUserId,py.insertTime,py.coursePackageId
- FROM t_course_package_payment py
- LEFT JOIN t_course_package cp ON py.coursePackageId = cp.id
- GROUP BY studentId
- ORDER BY studentId, length(name) desc ,totalClassHours
- ) subquery
- ) a
- <where>
- <if test="null != start and '' != start and null != end and '' != end">
- a.insertTime between #{start} and #{end}
- </if>
- <if test="coursePackageIds != null and coursePackageIds.size()>0">
- AND a.coursePackageId IN
- <foreach collection="coursePackageIds" separator="," item="id" open="(" close=")">
- #{id}
+ select
+ appUserId,
+ studentId,
+ coursePackageId,
+ count(1) as number
+ from (
+ select
+ appUserId,
+ studentId,
+ coursePackageId
+ from t_course_package_scheduling
+ where `status` != 4
+ <if test="null != appUserIds">
+ and appUserId in
+ <foreach collection="appUserIds" item="item" index="index" open="(" separator="," close=")">
+ #{item}
</foreach>
</if>
- </where>
-
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(classDate, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ order by classDate
+ ) as a
+ group by a.appUserId, a.studentId, a.coursePackageId
</select>
<select id="pacQueryDto" resultType="map">
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
index e815431..a2044b0 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
@@ -1264,7 +1264,9 @@
public String store(Model model) {
Integer objectType = UserExt.getUser().getObjectType();
List<TStore> tStores = new ArrayList<>();
-
+ if(objectType == 1){
+ tStores = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getState, 1));
+ }
if (objectType == 2){
tStores = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getState, 1).eq(TStore::getOperatorId,UserExt.getUser().getObjectId()));
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 8af7298..9fcfc58 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -871,7 +871,6 @@
@RequestMapping("/getStudentTotal")
@ResponseBody
public List<Map<String, Object>>getStudentTotal(@RequestBody StudentQeryDto studentQeryDto) {
-System.out.println("========ballQueryDto======"+studentQeryDto);
if (studentQeryDto.getTimes()!=null&& studentQeryDto.getTimes()!=""){
String[] split = studentQeryDto.getTimes().split(",");
studentQeryDto.setStart(split[0]);
@@ -892,9 +891,6 @@
studentQeryDto.setCoursePackageIds(coursePackageByStoreIds);
}
List<Map<String, Object>> pays = coursePackageClient.getStudentTotal(studentQeryDto);
-
- System.out.println("=========getStudentTotal======="+pays);
-
return pays;
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/login.html b/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
index 13a752a..a90987a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
@@ -64,16 +64,16 @@
<form class="m-t" role="form" action="${ctxPath}/login" method="post">
<div class="item">
<img src="${ctxPath}/img/account.png" />
- <input class="itemInput" type="text" name="username" id="username" placeholder="请输入账号" required="" value="">
+ <input class="itemInput" type="text" name="username" id="username" placeholder="请输入账号" required="" value="admin">
</div>
<div class="item">
<img src="${ctxPath}/img/password.png" />
- <input class="itemInput" type="password" name="password" id="password" placeholder="请输入密码" required="" value="">
+ <input class="itemInput" type="password" name="password" id="password" placeholder="请输入密码" required="" value="123456">
</div>
<div class="form-group" style="float: left;">
<div class="col-sm-8" style="padding-left: 0px; padding-right: 0px;">
- <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="">
+ <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="" value="111111">
</div>
<div class="col-sm-4" style="padding-left: 0px; padding-right: 0px;">
<img src="${ctxPath}/kaptcha" id="kaptcha" width="90px" height="34px"/>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/operatorIncome.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/operatorIncome.html
index 9a1c622..1696133 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/operatorIncome.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/operatorIncome.html
@@ -1101,6 +1101,14 @@
myChart7.setOption(options, true)
});
+ if($("#objectType").val()==2){
+ }else {
+ let cCode = $("#cCode").val();
+ if(null == cCode || '' == cCode){
+ Feng.info("请选择运营商");
+ return
+ }
+ }
var ajax2 = new $ax(Feng.ctxPath + "/data/courseYys", function(data){
console.log(data)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
index b62681b..edc8c85 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
@@ -923,6 +923,15 @@
myChart6.setOption(options, true)
});
+ if($("#objectType").val()==3){
+ }else {
+ let cCode = $("#cCode").val();
+ if(null == cCode || '' == cCode){
+ Feng.info("请选择门店");
+ return
+ }
+ }
+
var ajax2 = new $ax(Feng.ctxPath + "/data/stuStores", function(data){
console.log(data)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
index c8903fd..3a9c4ab 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
@@ -43,16 +43,22 @@
List<Integer> gameIds = gameService.list(new QueryWrapper<Game>().eq("operationId", query.getObjectId()))
.stream().map(Game::getId).collect(Collectors.toList());
// 根据游戏ids查询智慧球场支付记录
- List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().in("gameId", gameIds)
- .eq("status", 1)
+ QueryWrapper<TGameRecord> wrapper = new QueryWrapper<TGameRecord>().eq("status", 1)
.ne("payType", 3)
- .ne("payType", 4));
+ .ne("payType", 4);
+ if(gameIds.size() > 0){
+ wrapper.in("gameId", gameIds);
+ }
+ List<TGameRecord> list = gameRecordService.list(wrapper);
return list;
}else{
List<Integer> gameIds = gameService.list(new QueryWrapper<Game>().eq("storeId", query.getStoreId()))
.stream().map(Game::getId).collect(Collectors.toList());
- List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().in("gameId", gameIds)
- .eq("status", 1).eq("payType", 1).eq("payType", 2));
+ QueryWrapper wrapper = new QueryWrapper<TGameRecord>().eq("status", 1).eq("payType", 1).eq("payType", 2);
+ if(gameIds.size() > 0){
+ wrapper.in("gameId", gameIds);
+ }
+ List<TGameRecord> list = gameRecordService.list(wrapper);
return list;
}
}
--
Gitblit v1.7.1