From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
service-api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 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
old mode 100644
new mode 100755
index 207e76b..331b46d
--- 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,18 +4,20 @@
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.room.IRoomBMO;
import com.java110.core.context.DataFlowContext;
-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.core.factory.GenerateCodeFactory;
import com.java110.dto.RoomDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerRoomRelDto;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.po.community.CommunityMemberPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.floor.FloorPo;
import com.java110.po.owner.OwnerRoomRelPo;
+import com.java110.po.room.RoomAttrPo;
import com.java110.po.room.RoomPo;
import com.java110.po.unit.UnitPo;
import com.java110.utils.constant.BusinessTypeConstant;
@@ -28,6 +30,7 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -205,7 +208,28 @@
businessUnit.put("roomId", "-1");
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
RoomPo roomPo = BeanConvertUtil.covertBean(businessUnit, RoomPo.class);
- super.delete(dataFlowContext, roomPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_ROOM_INFO);
+ super.insert(dataFlowContext, roomPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_ROOM_INFO);
+ }
+
+ @Override
+ public void addRoomAttr(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ RoomAttrPo roomAttrPo = new RoomAttrPo();
+ roomAttrPo.setAttrId(GenerateCodeFactory.getAttrId());
+ roomAttrPo.setRoomId(paramInJson.getString("roomId"));
+ roomAttrPo.setSpecCd(paramInJson.getString("specCd"));
+ roomAttrPo.setValue(paramInJson.getString("value"));
+ super.insert(dataFlowContext, roomAttrPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_ROOM_INFO);
+ }
+
+
+ @Override
+ public void updateRoomAttr(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ RoomAttrPo roomAttrPo = new RoomAttrPo();
+ roomAttrPo.setAttrId(paramInJson.getString("attrId"));
+ roomAttrPo.setRoomId(paramInJson.getString("roomId"));
+ roomAttrPo.setSpecCd(paramInJson.getString("specCd"));
+ roomAttrPo.setValue(paramInJson.getString("value"));
+ super.update(dataFlowContext, roomAttrPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_ROOM_INFO);
}
/**
@@ -247,7 +271,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");
@@ -266,7 +291,16 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public void updateShellRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
+ //鑾峰彇鎴垮眿鐘舵��
+ String state = paramInJson.getString("state");
+ if (!StringUtil.isEmpty(paramInJson.getString("startTime")) && !StringUtil.isEmpty(state) && state.equals("2006")) {
+ String startTime = paramInJson.getString("startTime");
+ paramInJson.put("startTime", startTime + " 00:00:00");
+ }
+ if (!StringUtil.isEmpty(paramInJson.getString("endTime")) && !StringUtil.isEmpty(state) && state.equals("2006")) {
+ String endTime = paramInJson.getString("endTime");
+ paramInJson.put("endTime", endTime + " 23:59:59");
+ }
JSONObject businessUnit = new JSONObject();
businessUnit.putAll(paramInJson);
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
--
Gitblit v1.8.0