feat:首页统计

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

@@ -5379,8 +5379,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		List<CourseScheduleStudentPayment> otherCoursePayments = courseScheduleStudentPayments.stream().filter(c -> c.getCourseScheduleId().equals(mainCourseId)).collect(Collectors.toList());
 
-		for (CourseScheduleStudentPayment otherCoursePayment : otherCoursePayments) {
+		List<Long> deletePaymentIds = new ArrayList<>();
+		List<CourseScheduleStudentPayment> updatePayments = new ArrayList<>();
 
+		for (CourseScheduleStudentPayment otherCoursePayment : otherCoursePayments) {
+			CourseScheduleStudentPayment mainCoursePayment = studentMainCoursePaymentMap.get(otherCoursePayment.getUserId());
+			if(Objects.nonNull(mainCoursePayment.getBeMerged())&&mainCoursePayment.getBeMerged()){
+				deletePaymentIds.add(mainCoursePayment.getId());
+				continue;
+			}
+			mainCoursePayment.setExpectPrice();
 		}
     }
 }

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

@@ -298,7 +298,7 @@ public class VipGroupManageController extends BaseController {
     @ApiOperation("课酬总费用")
     @PostMapping("/getVipGroupCostCount")
     @PreAuthorize("@pcs.hasPermissions('vipGroupManage/getVipGroupCostCount')")
-    public Object getVipGroupCostCount(VipGroupApplyBaseInfoDto vipGroup){
+    public Object getVipGroupCostCount(@RequestBody VipGroupApplyBaseInfoDto vipGroup){
         Map results = vipGroupService.countVipGroupPredictFee(vipGroup,vipGroup.getUserId());
         return succeed(results);
     }