From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-user/src/main/java/com/java110/user/cmd/owner/SaveHandoverCmd.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 fe52f87..b8bdc7e 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
@@ -5,7 +5,7 @@
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.RoomDto;
@@ -13,12 +13,12 @@
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;
import com.java110.dto.user.UserDto;
-import com.java110.intf.community.IOwnerRoomRelV1InnerServiceSMO;
-import com.java110.intf.community.IOwnerV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
+import com.java110.intf.user.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;
@@ -26,7 +26,7 @@
import com.java110.po.owner.OwnerPo;
import com.java110.po.owner.OwnerRoomRelPo;
import com.java110.po.payFeeBatch.PayFeeBatchPo;
-import com.java110.utils.constant.CommonConstant;
+import com.java110.po.room.RoomPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -35,11 +35,10 @@
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
-import java.util.ArrayList;
import java.util.List;
@Java110Cmd(serviceCode = "owner.saveHandover")
-public class SaveHandoverCmd extends AbstractServiceCmdListener {
+public class SaveHandoverCmd extends Cmd {
@Autowired
private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl;
@@ -64,6 +63,9 @@
@Autowired
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
+ @Autowired
+ private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
@@ -123,6 +125,15 @@
ownerRoomRelPo.setState("2001");
ownerRoomRelPo.setUserId("-1");
flag = ownerRoomRelV1InnerServiceSMOImpl.saveOwnerRoomRel(ownerRoomRelPo);
+ 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("鎿嶄綔涓氫富澶辫触");
}
@@ -224,7 +235,7 @@
throw new CmdException("淇濆瓨璐圭敤澶辫触");
}
- if (FeeDto.FEE_FLAG_ONCE.equals(businessUnit.getString("feeFlag"))) {
+ if (!FeeDto.FEE_FLAG_CYCLE.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);
--
Gitblit v1.8.0