From cab3425bb92d01f3494eb25c1f299038dc634c65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 15 三月 2023 23:43:48 +0800
Subject: [PATCH] 优化保养转单功能
---
service-user/src/main/java/com/java110/user/cmd/owner/SaveHandoverCmd.java | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 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 bd051a3..6824dd9 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
@@ -93,6 +93,9 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
OwnerPo ownerPo = BeanConvertUtil.covertBean(reqJson, OwnerPo.class);
int flag = 0;
+ if (ownerPo.getAge().equals("")) {
+ ownerPo.setAge(null);
+ }
if (reqJson.containsKey("ownerId") && !StringUtil.isEmpty(reqJson.getString("ownerId"))) {
ownerPo.setMemberId(ownerPo.getOwnerId());
flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
@@ -105,12 +108,9 @@
flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
reqJson.put("ownerId", ownerPo.getOwnerId());
}
-
if (flag < 1) {
throw new CmdException("鎿嶄綔涓氫富澶辫触");
}
-
-
JSONArray rooms = reqJson.getJSONArray("rooms");
OwnerRoomRelPo ownerRoomRelPo = null;
for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
@@ -128,7 +128,6 @@
if (flag < 1) {
throw new CmdException("鎿嶄綔涓氫富澶辫触");
}
-
RoomPo roomPo = new RoomPo();
roomPo.setRoomId(rooms.getJSONObject(roomIndex).getString("roomId"));
roomPo.setCommunityId(reqJson.getString("communityId"));
@@ -138,35 +137,28 @@
throw new CmdException("鎿嶄綔涓氫富澶辫触");
}
}
-
if (!reqJson.containsKey("fees")) {
cmdDataFlowContext.setResponseEntity(ResultVo.success());
return;
}
-
JSONArray fees = reqJson.getJSONArray("fees");
if (fees.size() < 1) {
cmdDataFlowContext.setResponseEntity(ResultVo.success());
return;
}
-
generatorBatch(reqJson);
-
JSONObject paramInJson = null;
PayFeePo payFeePo = null;
-
FeeAttrPo feeAttrPo = null;
-
List<RoomDto> roomDtos = null;
RoomDto roomDto = null;
-
for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
roomDto = new RoomDto();
roomDto.setRoomId(rooms.getJSONObject(roomIndex).getString("roomId"));
roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
- Assert.listOnlyOne(roomDtos,"鎴垮眿涓嶅瓨鍦�");
+ Assert.listOnlyOne(roomDtos, "鎴垮眿涓嶅瓨鍦�");
for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
@@ -201,7 +193,7 @@
businessUnit.put("state", "2008001");
businessUnit.put("batchId", reqJson.getString("batchId"));
businessUnit.put("userId", "-1");
- businessUnit.put("bId","-1");
+ businessUnit.put("bId", "-1");
payFeePo = BeanConvertUtil.covertBean(businessUnit, PayFeePo.class);
@@ -235,7 +227,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);
@@ -261,17 +253,14 @@
UserDto userDto = new UserDto();
userDto.setUserId(reqJson.getString("userId"));
List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
-
Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
payFeeBatchPo.setCreateUserName(userDtos.get(0).getUserName());
payFeeBatchPo.setState(PayFeeBatchDto.STATE_NORMAL);
payFeeBatchPo.setMsg("姝ｅ父");
int flag = payFeeBatchV1InnerServiceSMOImpl.savePayFeeBatch(payFeeBatchPo);
-
if (flag < 1) {
throw new IllegalArgumentException("鐢熸垚鎵规澶辫触");
}
-
reqJson.put("batchId", payFeeBatchPo.getBatchId());
}
@@ -285,4 +274,4 @@
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
return feeAttrPo;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0