From 0a9b6e565843bd25e5ef37e979c7da9bbf3df218 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 22 四月 2022 17:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/owner/SaveHandoverCmd.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/SaveHandoverCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/SaveHandoverCmd.java
index e19f10f..d549cf5 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/SaveHandoverCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/SaveHandoverCmd.java
@@ -11,6 +11,7 @@
import com.java110.dto.RoomDto;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.payFeeBatch.PayFeeBatchDto;
@@ -18,6 +19,7 @@
import com.java110.intf.community.IOwnerRoomRelV1InnerServiceSMO;
import com.java110.intf.community.IOwnerV1InnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.community.IRoomV1InnerServiceSMO;
import com.java110.intf.fee.*;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.fee.FeeAttrPo;
@@ -25,6 +27,7 @@
import com.java110.po.owner.OwnerPo;
import com.java110.po.owner.OwnerRoomRelPo;
import com.java110.po.payFeeBatch.PayFeeBatchPo;
+import com.java110.po.room.RoomPo;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
@@ -63,6 +66,9 @@
@Autowired
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
+ @Autowired
+ private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
@@ -125,6 +131,15 @@
if (flag < 1) {
throw new CmdException("鎿嶄綔涓氫富澶辫触");
}
+
+ RoomPo roomPo = new RoomPo();
+ roomPo.setRoomId(rooms.getJSONObject(roomIndex).getString("roomId"));
+ roomPo.setCommunityId(reqJson.getString("communityId"));
+ roomPo.setState(RoomDto.STATE_SELL);
+ flag = roomV1InnerServiceSMOImpl.updateRoom(roomPo);
+ if (flag < 1) {
+ throw new CmdException("鎿嶄綔涓氫富澶辫触");
+ }
}
if (!reqJson.containsKey("fees")) {
@@ -162,9 +177,7 @@
String time = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A);
- if (paramInJson.containsKey("endTime")) {
- time = paramInJson.getString("endTime");
- } else if (paramInJson.containsKey("startTime")) {
+ if (paramInJson.containsKey("startTime")) {
time = paramInJson.getString("startTime");
}
@@ -191,6 +204,7 @@
businessUnit.put("state", "2008001");
businessUnit.put("batchId", reqJson.getString("batchId"));
businessUnit.put("userId", "-1");
+ businessUnit.put("bId","-1");
payFeePo = BeanConvertUtil.covertBean(businessUnit, PayFeePo.class);
@@ -223,6 +237,15 @@
if (flag < 1) {
throw new CmdException("淇濆瓨璐圭敤澶辫触");
}
+
+ if (FeeDto.FEE_FLAG_ONCE.equals(businessUnit.getString("feeFlag"))) {
+ feeAttrPo = addFeeAttr(businessUnit, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
+ paramInJson.containsKey("endTime") ? paramInJson.getString("endTime") : feeConfigDtos.get(0).getEndTime());
+ flag = feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
+ if (flag < 1) {
+ throw new CmdException("淇濆瓨璐圭敤澶辫触");
+ }
+ }
}
}
--
Gitblit v1.8.0