From eea796cbce11abfee00b81f8301e99ad8ef5af26 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 22 六月 2020 13:03:03 +0800
Subject: [PATCH] 优化

---
 service-api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java
index 207e76b..e413ad8 100644
--- a/service-api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java
@@ -4,10 +4,10 @@
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.room.IRoomBMO;
 import com.java110.core.context.DataFlowContext;
+import com.java110.core.smo.community.IRoomInnerServiceSMO;
 import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
 import com.java110.core.smo.fee.IFeeInnerServiceSMO;
 import com.java110.core.smo.user.IOwnerRoomRelInnerServiceSMO;
-import com.java110.core.smo.community.IRoomInnerServiceSMO;
 import com.java110.dto.RoomDto;
 import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.fee.FeeDto;
@@ -247,7 +247,8 @@
         businessUnit.put("incomeObjId", paramInJson.getString("storeId"));
         businessUnit.put("amount", "-1.00");
         businessUnit.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
-        businessUnit.put("endTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        businessUnit.put("endTime", paramInJson.containsKey("feeEndDate") ? paramInJson.getString("feeEndDate")
+                : DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         businessUnit.put("communityId", paramInJson.getString("communityId"));
         businessUnit.put("payerObjId", paramInJson.getString("roomId"));
         businessUnit.put("payerObjType", "3333");

--
Gitblit v1.8.0