活动排课

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ReturnFeeDto.java

@@ -8,7 +8,7 @@ import java.math.BigDecimal;
 public class ReturnFeeDto {
 
     @ApiModelProperty(value = "课程组编号",required = false)
-    private Long groupId;
+    private Long vipGroupId;
 
     @ApiModelProperty(value = "退费学员",required = false)
     private Integer studentId;
@@ -29,12 +29,12 @@ public class ReturnFeeDto {
         this.groupType = groupType;
     }
 
-    public Long getGroupId() {
-        return groupId;
+    public Long getVipGroupId() {
+        return vipGroupId;
     }
 
-    public void setGroupId(Long groupId) {
-        this.groupId = groupId;
+    public void setVipGroupId(Long vipGroupId) {
+        this.vipGroupId = vipGroupId;
     }
 
     public Integer getStudentId() {

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

@@ -150,7 +150,7 @@ public class GroupClassServiceImpl implements GroupClassService {
     @Override
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     public HttpResponseResult cancelGroup(ReturnFeeDto returnFeeDto) {
-        Long groupId = returnFeeDto.getGroupId();
+        Long groupId = returnFeeDto.getVipGroupId();
         if (Objects.isNull(groupId)) {
             throw new BizException("请指定课程组");
         }

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

@@ -4646,12 +4646,12 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         teacherDefaultSalary = teacherDefaultPracticeGroupSalary.getMainTeacherSalary();
         if(Objects.nonNull(salarySettlement)){
             if(salarySettlement.getSalarySettlementType() == SalarySettlementTypeEnum.FIXED_SALARY){
-                teacherDefaultSalary = salarySettlement.getSettlementValue().setScale(0, BigDecimal.ROUND_HALF_UP);
+                teacherDefaultSalary = salarySettlement.getSettlementValue();
             }
         }
 
         results.put("totalPrice",totalPrice.setScale(0,BigDecimal.ROUND_CEILING));
-        results.put("onlineTeacherSalary",teacherDefaultSalary.setScale(0, BigDecimal.ROUND_HALF_UP));
+        results.put("onlineTeacherSalary",teacherDefaultSalary.setScale(2, BigDecimal.ROUND_HALF_UP));
         return results;
     }
 

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

@@ -2229,7 +2229,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				teacherOnlineSalary = vipOnlineSalarySettlement.getSettlementValue();
 			}
 		}
-		results.put("onlineTeacherSalary",teacherOnlineSalary.setScale(0, BigDecimal.ROUND_HALF_UP));
+		results.put("onlineTeacherSalary",teacherOnlineSalary.setScale(2, BigDecimal.ROUND_HALF_UP));
 
 		//教师课酬赠送线上单课酬计算
 		if(vipGroupCategory.getMusicTheory()){
@@ -2242,7 +2242,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				giveTeacherOnlineSalary = giveVipOnlineSalarySettlement.getSettlementValue();
 			}
 		}
-		results.put("giveOnlineTeacherSalary",giveTeacherOnlineSalary.setScale(0, BigDecimal.ROUND_HALF_UP));
+		results.put("giveOnlineTeacherSalary",giveTeacherOnlineSalary.setScale(2, BigDecimal.ROUND_HALF_UP));
 
 		//教师线下单课酬计算
 		if(vipGroupCategory.getMusicTheory()){
@@ -2255,7 +2255,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				teacherOfflineSalary = vipOfflineSalarySettlement.getSettlementValue();
 			}
 		}
-		results.put("offlineTeacherSalary",teacherOfflineSalary.setScale(0, BigDecimal.ROUND_HALF_UP));
+		results.put("offlineTeacherSalary",teacherOfflineSalary.setScale(2, BigDecimal.ROUND_HALF_UP));
 
 		//教师赠送线下单课酬计算
 		if(vipGroupCategory.getMusicTheory()){
@@ -2268,7 +2268,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				giveTeacherOfflineSalary = giveVipOfflineSalarySettlement.getSettlementValue();
 			}
 		}
-		results.put("giveOfflineTeacherSalary",giveTeacherOfflineSalary.setScale(0, BigDecimal.ROUND_HALF_UP));
+		results.put("giveOfflineTeacherSalary",giveTeacherOfflineSalary.setScale(2, BigDecimal.ROUND_HALF_UP));
 
 		BigDecimal ots = results.get("onlineTeacherSalary");
 		if(Objects.isNull(ots)){
@@ -2380,8 +2380,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		results.put("totalPrice",totalPrice.setScale(0,BigDecimal.ROUND_CEILING));
 		vipGroup.setTotalPrice(totalPrice.setScale(0,BigDecimal.ROUND_CEILING));
 
-		Integer studentNum = vipGroup.getStudentIdList().split(",").length;
-
 		//教师课酬线上单课酬计算
 		teacherOnlineSalary = teacherDefaultVipGroupSalary.getOnlineClassesSalary();
 		if(Objects.nonNull(vipOnlineSalarySettlement)){
@@ -2389,7 +2387,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				teacherOnlineSalary = vipOnlineSalarySettlement.getSettlementValue();
 			}
 		}
-		results.put("onlineTeacherSalary",teacherOnlineSalary.setScale(0, BigDecimal.ROUND_HALF_UP));
+		results.put("onlineTeacherSalary",teacherOnlineSalary.setScale(2, BigDecimal.ROUND_HALF_UP));
 
 		//教师课酬赠送线上单课酬计算
 		giveTeacherOnlineSalary = teacherDefaultVipGroupSalary.getOnlineClassesSalary();
@@ -2398,7 +2396,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				giveTeacherOnlineSalary = giveVipOnlineSalarySettlement.getSettlementValue();
 			}
 		}
-		results.put("giveOnlineTeacherSalary",giveTeacherOnlineSalary.setScale(0, BigDecimal.ROUND_HALF_UP));
+		results.put("giveOnlineTeacherSalary",giveTeacherOnlineSalary.setScale(2, BigDecimal.ROUND_HALF_UP));
 
 		//教师线下单课酬计算
 		teacherOfflineSalary = teacherDefaultVipGroupSalary.getOfflineClassesSalary();
@@ -2407,7 +2405,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				teacherOfflineSalary = vipOfflineSalarySettlement.getSettlementValue();
 			}
 		}
-		results.put("offlineTeacherSalary",teacherOfflineSalary.setScale(0, BigDecimal.ROUND_HALF_UP));
+		results.put("offlineTeacherSalary",teacherOfflineSalary.setScale(2, BigDecimal.ROUND_HALF_UP));
 
 		//教师赠送线下单课酬计算
 		giveTeacherOfflineSalary = teacherDefaultVipGroupSalary.getOfflineClassesSalary();
@@ -2416,7 +2414,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				giveTeacherOfflineSalary = giveVipOfflineSalarySettlement.getSettlementValue();
 			}
 		}
-		results.put("giveOfflineTeacherSalary",giveTeacherOfflineSalary.setScale(0, BigDecimal.ROUND_HALF_UP));
+		results.put("giveOfflineTeacherSalary",giveTeacherOfflineSalary.setScale(2, BigDecimal.ROUND_HALF_UP));
 
 		BigDecimal ots = results.get("onlineTeacherSalary");
 		if(Objects.isNull(ots)){
@@ -3202,7 +3200,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public HttpResponseResult applyRefundForStudent(ReturnFeeDto returnFeeDto) {
-		Long vipGroupId = returnFeeDto.getGroupId();
+		Long vipGroupId = returnFeeDto.getVipGroupId();
 		Integer studentId = returnFeeDto.getStudentId();
 		if(Objects.isNull(vipGroupId) || Objects.isNull(studentId)){
 			throw new BizException("请指定小课与学生");