管乐迷迭代

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupReturnFeeDto.java

@@ -6,23 +6,23 @@ public class MusicGroupReturnFeeDto {
 
 	private Boolean isReturnCourseFee = false;
 	
-	private BigDecimal courseFee;
+	private BigDecimal courseFee = BigDecimal.ZERO;
 	
 	private Boolean isReturnMemberFee = false;
 	
-	private BigDecimal memberFee;
+	private BigDecimal memberFee = BigDecimal.ZERO;
 	
 	private Boolean isReturnMusicalFee = false;
 	
-	private BigDecimal musicalFee;
+	private BigDecimal musicalFee = BigDecimal.ZERO;
 	
 	private Boolean isReturnAccessoriesFee = false;
 	
-	private BigDecimal accessoriesFee;
+	private BigDecimal accessoriesFee = BigDecimal.ZERO;
 	
 	private Boolean isReturnMaintenanceFee = false;
 	
-	private BigDecimal maintenanceFee;
+	private BigDecimal maintenanceFee = BigDecimal.ZERO;
 
 	public Boolean getIsReturnCourseFee() {
 		return isReturnCourseFee;

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

@@ -2103,7 +2103,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupQuit.setStatus(status);
         musicGroupQuit.setReason(reason);
         musicGroupQuit.setQuitDate(date);
-        musicGroupQuit.setFeeJson(JsonUtil.toJSONString(returnFeeDto));
+
 		if (visitDate != null) {
 			musicGroupQuit.setVisitTime(visitDate);
 			musicGroupQuit.setIsVisit(true);
@@ -2116,22 +2116,26 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		}
     	
     	BigDecimal returnTotalFee = BigDecimal.ZERO;
-    	
-    	if(returnFeeDto.getIsReturnAccessoriesFee()){
-    		returnTotalFee = returnTotalFee.add(returnFeeDto.getAccessoriesFee());
-    	}
-    	if(returnFeeDto.getIsReturnCourseFee()){
-    		returnTotalFee = returnTotalFee.add(returnFeeDto.getCourseFee());
-    	}
-    	if(returnFeeDto.getIsReturnMaintenanceFee()){
-    		returnTotalFee = returnTotalFee.add(returnFeeDto.getMaintenanceFee());
-    	}
-    	if(returnFeeDto.getIsReturnMemberFee()){
-    		returnTotalFee = returnTotalFee.add(returnFeeDto.getMemberFee());
-    	}
-    	if(returnFeeDto.getIsReturnMusicalFee()){
-    		returnTotalFee = returnTotalFee.add(returnFeeDto.getMusicalFee());
-    	}
+
+		if(returnFeeDto == null){
+            returnFeeDto = new MusicGroupReturnFeeDto();
+        }
+        musicGroupQuit.setFeeJson(JsonUtil.toJSONString(returnFeeDto));
+        if(returnFeeDto.getIsReturnAccessoriesFee()){
+            returnTotalFee = returnTotalFee.add(returnFeeDto.getAccessoriesFee());
+        }
+        if(returnFeeDto.getIsReturnCourseFee()){
+            returnTotalFee = returnTotalFee.add(returnFeeDto.getCourseFee());
+        }
+        if(returnFeeDto.getIsReturnMaintenanceFee()){
+            returnTotalFee = returnTotalFee.add(returnFeeDto.getMaintenanceFee());
+        }
+        if(returnFeeDto.getIsReturnMemberFee()){
+            returnTotalFee = returnTotalFee.add(returnFeeDto.getMemberFee());
+        }
+        if(returnFeeDto.getIsReturnMusicalFee()){
+            returnTotalFee = returnTotalFee.add(returnFeeDto.getMusicalFee());
+        }
     	
     	musicGroupQuit.setReturnTotalFee(returnTotalFee);