From 6bf8b48e9d689ab90864bc2ee0e6ebeae3a4c1fa Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 04 八月 2022 10:06:47 +0800
Subject: [PATCH] 1.优化报表缴费明细统计问题2、优化调查问卷投票问题3、优化投诉咨询问题3、优化业主新增用户联系地址4、增加定时任务根据身份证号自动更新年龄5、优化缴费清单

---
 service-user/src/main/java/com/java110/user/cmd/owner/SaveHandoverCmd.java |   23 ++++++-----------------
 1 files changed, 6 insertions(+), 17 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 b8bdc7e..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);
 
@@ -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("姝e父");
         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