乐团乐器提供方式增加减免课程费用

乐团增加可选课程费用

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OperatingReportServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.OperatingReport;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
@@ -21,6 +22,7 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
     @Autowired
     private OperatingReportDao operatingReportDao;
     private StudentPaymentOrderDao studentPaymentOrderDao;
+    private MusicGroupDao musicGroupDao;
 
 
     @Override
@@ -37,6 +39,18 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
         params.put("orderEndDate", DateUtil.getDate(startTime));
         params.put("paymentStatus", "SUCCESS");
 
+//        APPLY("APPLY", "报名"),
+//                RENEW("RENEW", "续费"),
+//                SPORADIC("SPORADIC", "零星收费"),
+//                OTHER("OTHER", "其他"),
+//                SMALL_CLASS_TO_BUY("SMALL_CLASS_TO_BUY", "VIP购买"),
+//                PRACTICE_GROUP_BUY("PRACTICE_GROUP_BUY", "网管课购买"),
+//                PRACTICE_GROUP_RENEW("PRACTICE_GROUP_RENEW", "网管课续费"),
+//                COURSE_GROUP_BUY("COURSE_GROUP_BUY","对外课程购买"),
+//                LUCK("LUCK", "福袋活动"),
+//                TENANT_RECHARGE("TENANT_RECHARGE","租户充值"),
+//                REPAIR("REPAIR","乐器维修");
+
         Map<String, OperatingReport> schoolOperating = new HashMap<>();
         Map<String, OperatingReport> organOperating = new HashMap<>();
         List<StudentPaymentOrder> orders = studentPaymentOrderDao.queryPageOrder(params);
@@ -44,6 +58,9 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
             if(order.getType().equals(OrderTypeEnum.APPLY)){
                 continue;
             }
+            if(order.getType().equals(OrderTypeEnum.RENEW)){
+                MusicGroup musicGroup = musicGroupDao.get(order.getMusicGroupId());
+            }
 
         }
 

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

@@ -71,7 +71,7 @@ public class OperatingReportController extends BaseController {
 
 
     @ApiOperation(value = "经营报表导出")
-    @GetMapping("operatingReport/export")
+    @GetMapping("/export")
     @PreAuthorize("@pcs.hasPermissions('operatingReport/export')")
     public void operatingReport(OperatingReportQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();