From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-api/src/main/java/com/java110/api/listener/fee/SaveRoomCreateFeeListener.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/listener/fee/SaveRoomCreateFeeListener.java b/service-api/src/main/java/com/java110/api/listener/fee/SaveRoomCreateFeeListener.java
index df4d786..73560dd 100755
--- a/service-api/src/main/java/com/java110/api/listener/fee/SaveRoomCreateFeeListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/SaveRoomCreateFeeListener.java
@@ -84,7 +84,7 @@
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) throws ParseException {
         logger.debug("ServiceDataFlowEvent : {}", event);
         List<RoomDto> roomDtos = null;
         FeeConfigDto feeConfigDto = new FeeConfigDto();
@@ -114,7 +114,8 @@
         /*if (reqJson.containsKey("roomState") && RoomDto.STATE_SELL.equals(reqJson.getString("roomState"))) {
             roomDto.setState(RoomDto.STATE_SELL);
         }*/
-        if (reqJson.containsKey("roomState") && reqJson.getString("roomState").contains(",")) {
+        if (reqJson.containsKey("roomState")
+                && (reqJson.getString("roomState").contains(",") || !StringUtil.isEmpty(reqJson.getString("roomState")))) {
             String states = reqJson.getString("roomState");
             roomDto.setStates(states.split(","));
         }
@@ -153,7 +154,7 @@
         dealRoomFee(roomDtos, context, reqJson, event);
     }
 
-    private void dealRoomFee(List<RoomDto> roomDtos, DataFlowContext context, JSONObject reqJson, ServiceDataFlowEvent event) {
+    private void dealRoomFee(List<RoomDto> roomDtos, DataFlowContext context, JSONObject reqJson, ServiceDataFlowEvent event) throws ParseException {
         AppService service = event.getAppService();
         List<String> roomIds = new ArrayList<>();
         for (RoomDto roomDto : roomDtos) {

--
Gitblit v1.8.0