Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -341,100 +341,4 @@ public class StudentOrderController extends BaseController {
         luckStatisDto.setTotalMoney(totalMoney);
         return succeed(luckStatisDto);
     }
-
-
-    @GetMapping("/fixOrder")
-    private void fixOrder() throws Exception {
-        List<StudentPaymentOrder> payingOrders = studentPaymentOrderDao.findFixOrder();
-
-        if (payingOrders.size() == 0) {
-            return;
-        }
-        String merOrderNos = payingOrders.stream().map(StudentPaymentOrder::getOrderNo).collect(Collectors.joining(","));
-
-        String notifyUrl = ""; //回调地址
-        Map<String, Object> resultMap = new LinkedHashMap<>();
-        resultMap.put("merOrderNoList", merOrderNos);
-        Map<String, Object> requestMap = YqPayUtil.getRequestMap(notifyUrl, resultMap);
-
-        RsqMsg rsqMsg = new RsqMsg(requestMap);
-
-        Msg queryRs = yqPayFeignService.orderQuery(rsqMsg);
-
-        if (queryRs.getCode().equals("88")) {
-            String responseParameters = queryRs.getResponseParameters();
-            List<Map<String, Object>> responseList = JSON.parseObject(responseParameters, List.class);
-            for (Map<String, Object> response : responseList) {
-                String type = "per";
-                String orderNo = (String) response.get("merOrderNo");
-                String tempRoutingResultList = response.get("tempRoutingResultList").toString();
-                System.out.println(tempRoutingResultList);
-
-                if (tempRoutingResultList.contains("武汉大雅乐盟教育咨询有限公司")) {
-                    type = "com";
-                }
-                fixUpdateOrder(orderNo, type);
-            }
-        }
-    }
-
-    void fixUpdateOrder(String orderNo, String type) {
-        StudentPaymentOrder order = studentPaymentOrderService.findOrderByOrderNo(orderNo);
-        if (type.equals("com")) {
-            order.setComAmount(order.getActualAmount());
-            order.setPerAmount(BigDecimal.ZERO);
-            order.setMerNos("0023115");
-        } else {
-            order.setComAmount(BigDecimal.ZERO);
-            order.setPerAmount(order.getActualAmount());
-            order.setMerNos("0031215");
-        }
-        studentPaymentOrderService.update(order);
-    }
-
-    @GetMapping("/teacherCourseStatistic")
-    public HttpResponseResult teacherCourseStatistic() {
-        Date nextMonthDate = DateUtil.addMonths(new Date(), 1);
-        Date startDate = DateUtil.getFirstDayOfMonth(nextMonthDate);
-        Date endDate = DateUtil.getLastDayOfMonth(nextMonthDate);
-        BigDecimal salary = new BigDecimal("4000");
-        List<TeacherCourseStatistics> teacherCourseStatisticsList = teacherCourseStatisticsDao.findUserByWarringSalary(startDate, endDate, salary);
-        if(teacherCourseStatisticsList.size() ==0){
-            return failed("没有做");
-        }
-        List<Integer> userIds = teacherCourseStatisticsList.stream().map(TeacherCourseStatistics::getUserId).collect(Collectors.toList());
-
-        List<TeacherCourseStatistics> teCourseSalaryStatisAndTypes = teacherCourseStatisticsDao.findUserCourseSalaryByUserIds(userIds,startDate,endDate);
-
-        for (TeacherCourseStatistics teacherCourseStatistics : teacherCourseStatisticsList) {
-            int vipCourseNum = 0;
-            int musicCourseNum =0;
-            BigDecimal expectVipCourseSalary = BigDecimal.ZERO;
-            BigDecimal expectMusicCourseSalary = BigDecimal.ZERO;
-
-            for (TeacherCourseStatistics teCourseSalaryStatisAndType : teCourseSalaryStatisAndTypes) {
-                if(!teacherCourseStatistics.getUserId().equals(teCourseSalaryStatisAndType.getUserId())) continue;
-
-                if(teCourseSalaryStatisAndType.getGroupType().equals("VIP")){
-                    expectVipCourseSalary = teCourseSalaryStatisAndType.getExpectTotalSalary();
-                    vipCourseNum = teCourseSalaryStatisAndType.getMusicCourseNum();
-                }else if(teCourseSalaryStatisAndType.getGroupType().equals("MUSIC")){
-                    expectMusicCourseSalary = teCourseSalaryStatisAndType.getExpectTotalSalary();
-                    musicCourseNum = teCourseSalaryStatisAndType.getMusicCourseNum();
-                }
-            }
-            teacherCourseStatistics.setExpectVipCourseSalary(expectVipCourseSalary);
-            teacherCourseStatistics.setExpectMusicCourseSalary(expectMusicCourseSalary);
-            teacherCourseStatistics.setVipCourseNum(vipCourseNum);
-            teacherCourseStatistics.setMusicCourseNum(musicCourseNum);
-
-            if(teacherCourseStatistics.getSubjectIdList()==null){
-                teacherCourseStatistics.setSubjectIdList("");
-            }
-            teacherCourseStatistics.setMonth(startDate);
-        }
-
-        teacherCourseStatisticsDao.batchAdd(teacherCourseStatisticsList);
-        return succeed(teacherCourseStatisticsList);
-    }
 }

mec-web/src/main/java/com/ym/mec/web/controller/StudentAttendanceController.java

@@ -1,43 +0,0 @@
-package com.ym.mec.web.controller;
-
-import com.ym.mec.biz.dal.dto.StudentAttendanceDto;
-import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.StudentAttendanceService;
-import com.ym.mec.common.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Author Joburgess
- * @Date 2020/1/17
- */
-@RequestMapping("studentAttendance")
-@Api(tags = "学生签到服务")
-@RestController
-public class StudentAttendanceController extends BaseController {
-
-    @Autowired
-    private ClassGroupService classGroupService;
-    @Autowired
-    private StudentAttendanceService studentAttendanceService;
-
-    @ApiOperation(value = "查询课程学生列表")
-    @GetMapping("/findAttendanceStudentByCourseWithPage")
-    @PreAuthorize("@pcs.hasPermissions('teacherAttendance/findAttendanceStudentByCourseWithPage')")
-    public Object findAttendanceStudentByCourseWithPage(CourseScheduleQueryInfo queryInfo){
-        return succeed(classGroupService.findAttendanceStudentByCourseWithPage(queryInfo));
-    }
-
-    @ApiOperation(value = "更新学生签到记录")
-    @PostMapping("/updateStudentAttendances")
-    @PreAuthorize("@pcs.hasPermissions('teacherAttendance/updateStudentAttendances')")
-    public Object updateStudentAttendances(@RequestBody StudentAttendanceDto studentAttendanceInfo){
-        studentAttendanceService.updateStudentAttendances(studentAttendanceInfo);
-        return succeed();
-    }
-
-}

mec-web/src/main/java/com/ym/mec/web/controller/student/StudentAttendanceOldController.java → mec-web/src/main/java/com/ym/mec/web/controller/student/StudentAttendanceController.java

@@ -1,7 +1,9 @@
 package com.ym.mec.web.controller.student;
 
 import com.ym.mec.biz.dal.dto.StudentAttendanceDto;
+import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
 import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
+import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.StudentAttendanceService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
@@ -11,13 +13,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-@RequestMapping("studentAttendanceOld")
+@RequestMapping("studentAttendance")
 @Api(tags = "学生考勤服务")
 @RestController
-public class StudentAttendanceOldController extends BaseController {
+public class StudentAttendanceController extends BaseController {
 
     @Autowired
     private StudentAttendanceService studentAttendanceService;
+    @Autowired
+    private ClassGroupService classGroupService;
 
     @ApiOperation(value = "点名完成")
     @PostMapping("/addStudentAttendances")
@@ -39,4 +43,19 @@ public class StudentAttendanceOldController extends BaseController {
         return succeed(studentAttendanceService.findStudentAttendance(queryInfo));
     }
 
+    @ApiOperation(value = "查询课程学生列表")
+    @GetMapping("/findAttendanceStudentByCourseWithPage")
+    @PreAuthorize("@pcs.hasPermissions('teacherAttendance/findAttendanceStudentByCourseWithPage')")
+    public Object findAttendanceStudentByCourseWithPage(CourseScheduleQueryInfo queryInfo){
+        return succeed(classGroupService.findAttendanceStudentByCourseWithPage(queryInfo));
+    }
+
+    @ApiOperation(value = "更新学生签到记录")
+    @PostMapping("/updateStudentAttendances")
+    @PreAuthorize("@pcs.hasPermissions('teacherAttendance/updateStudentAttendances')")
+    public Object updateStudentAttendances(@RequestBody StudentAttendanceDto studentAttendanceInfo){
+        studentAttendanceService.updateStudentAttendances(studentAttendanceInfo);
+        return succeed();
+    }
+
 }