yonge il y a 4 ans
Parent
commit
52637f36be

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupQuit.java

@@ -57,7 +57,7 @@ public class MusicGroupQuit {
 	
 	private MusicGroup musicGroup = new MusicGroup();
 	
-	private MusicGroupReturnFeeDto returnFeeDto = new MusicGroupReturnFeeDto();
+	private MusicGroupReturnFeeDto returnFeeDto;
 
 	@ApiModelProperty(value = "是否有乐保",required = false)
 	private Boolean hasMaintenance = false;

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

@@ -1939,7 +1939,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupQuit.setReason(reason);
         
         MusicGroupReturnFeeDto returnFeeDto = reqMusicGroupQuit.getReturnFeeDto();
-        musicGroupQuit.setFeeJson(JsonUtil.toJSONString(returnFeeDto));
+        if(returnFeeDto != null) {
+        	musicGroupQuit.setFeeJson(JsonUtil.toJSONString(returnFeeDto));
+        }
         musicGroupQuit.setIsVisit(reqMusicGroupQuit.getIsVisit());
         musicGroupQuit.setVisitTime(reqMusicGroupQuit.getVisitTime());
         musicGroupQuit.setStatus(PROCESSING);