管乐迷迭代

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

@@ -17,7 +17,7 @@ public class ReturnFeeDto {
     private Integer studentId;
 
     @ApiModelProperty(value = "退费金额",required = false)
-    private BigDecimal refundAmount;
+    private BigDecimal amount;
 
     @ApiModelProperty(value = "是否确认退还活动赠送",required = false)
     private Boolean confirmReturnActivityGive = false;
@@ -56,12 +56,12 @@ public class ReturnFeeDto {
         this.studentId = studentId;
     }
 
-    public BigDecimal getRefundAmount() {
-        return refundAmount;
+    public BigDecimal getAmount() {
+        return amount;
     }
 
-    public void setRefundAmount(BigDecimal refundAmount) {
-        this.refundAmount = refundAmount;
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
     }
 
     public Boolean getConfirmReturnActivityGive() {

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

@@ -173,10 +173,10 @@ public class GroupClassServiceImpl implements GroupClassService {
             if (!practiceGroup.getGroupStatus().equals(GroupStatusEnum.NORMAL) || practiceGroup.getCoursesExpireDate().before(now)) {
                 throw new BizException("当前课程组不可关闭");
             }
-            if (Objects.nonNull(returnFeeDto.getRefundAmount()) && returnFeeDto.getRefundAmount().compareTo(BigDecimal.ZERO) > 0) {
+            if (Objects.nonNull(returnFeeDto.getAmount()) && returnFeeDto.getAmount().compareTo(BigDecimal.ZERO) > 0) {
                 Map<String, BigDecimal> studentSurplusCourseFee = practiceGroupService.getStudentSurplusCourseFee(groupId);
                 BigDecimal suplusCourseFee = studentSurplusCourseFee.get("suplusCourseOriginalFee");
-                if(returnFeeDto.getRefundAmount().compareTo(suplusCourseFee) > 0){
+                if(returnFeeDto.getAmount().compareTo(suplusCourseFee) > 0){
                     throw new BizException("学员最大可退费金额为{}元", suplusCourseFee.toString());
                 }
                 SysUserCashAccountLog sysUserCashAccountLog = new SysUserCashAccountLog();
@@ -184,7 +184,7 @@ public class GroupClassServiceImpl implements GroupClassService {
                 sysUserCashAccountLog.setUserId(practiceGroup.getStudentId());
                 sysUserCashAccountLog.setOrganId(practiceGroup.getOrganId());
                 sysUserCashAccountLog.setGroupId(practiceGroup.getId().toString());
-                sysUserCashAccountLog.setAmount(returnFeeDto.getRefundAmount());
+                sysUserCashAccountLog.setAmount(returnFeeDto.getAmount());
                 sysUserCashAccountLog.setReturnFeeType(ReturnFeeEnum.PRACTICE);
                 sysUserCashAccountLog.setComment("后台关闭网管课");
                 sysUserCashAccountLogDao.insert(sysUserCashAccountLog);