优化缴费明细

java110-db/src/main/resources/mapper/acct/AccountServiceDaoImplMapper.xml

@@ -90,7 +90,8 @@
     <select id="getAccountInfo" parameterType="Map" resultType="Map">
         select t.amount,t.acct_type,t.acct_type acctType,t.obj_id,t.obj_id objId,t.acct_id,t.acct_id
         acctId,t.status_cd,t.status_cd statusCd,t.acct_name,t.acct_name acctName,t.b_id,t.b_id bId,t.obj_type,t.obj_type
-        objType,t.create_time createTime,td.`name` acctTypeName,t.part_id,t.part_id partId,t.link
+        objType,t.create_time createTime,td.`name` acctTypeName,t.part_id,t.part_id partId,t.link,t.room_id roomId,
+        t.room_name roomName,
         <if test="objType !=null and objType == 6006">
             ,bo.id_card idCard
         </if>
@@ -152,6 +153,9 @@
         <if test="link !=null and link != ''">
             and t.link= #{link}
         </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}

service-acct/src/main/java/com/java110/acct/cmd/account/QueryCommunityOwnerAccountCmd.java

@@ -86,6 +86,11 @@ public class QueryCommunityOwnerAccountCmd extends Cmd {
         context.setResponseEntity(responseEntity);
     }
 
+    /**
+     * 判断参数中是否有feeId
+     * @param reqJson
+     * @param accountDto
+     */
     private void hasFeeId(JSONObject reqJson, AccountDto accountDto) {
 
         if (!reqJson.containsKey("feeId")) {

service-acct/src/main/java/com/java110/acct/dao/impl/AccountServiceDaoImpl.java

@@ -26,18 +26,18 @@ public class AccountServiceDaoImpl extends BaseServiceDao implements IAccountSer
     /**
      * 账户信息封装
      *
-     * @param businessAccountInfo 账户信息 封装
+     * @param info 账户信息 封装
      * @throws DAOException DAO异常
      */
     @Override
-    public void saveBusinessAccountInfo(Map businessAccountInfo) throws DAOException {
-        businessAccountInfo.put("month", DateUtil.getCurrentMonth());
+    public void saveBusinessAccountInfo(Map info) throws DAOException {
+        info.put("month", DateUtil.getCurrentMonth());
         // 查询business_user 数据是否已经存在
-        logger.debug("保存账户信息 入参 businessAccountInfo : {}", businessAccountInfo);
-        int saveFlag = sqlSessionTemplate.insert("accountServiceDaoImpl.saveBusinessAccountInfo", businessAccountInfo);
+        logger.debug("保存账户信息 入参 businessAccountInfo : {}", info);
+        int saveFlag = sqlSessionTemplate.insert("accountServiceDaoImpl.saveBusinessAccountInfo", info);
 
         if (saveFlag < 1) {
-            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存账户数据失败：" + JSONObject.toJSONString(businessAccountInfo));
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存账户数据失败：" + JSONObject.toJSONString(info));
         }
     }
 
@@ -54,9 +54,9 @@ public class AccountServiceDaoImpl extends BaseServiceDao implements IAccountSer
 
         logger.debug("查询账户信息 入参 info : {}", info);
 
-        List<Map> businessAccountInfos = sqlSessionTemplate.selectList("accountServiceDaoImpl.getBusinessAccountInfo", info);
+        List<Map> infos = sqlSessionTemplate.selectList("accountServiceDaoImpl.getBusinessAccountInfo", info);
 
-        return businessAccountInfos;
+        return infos;
     }
 
 
@@ -89,9 +89,9 @@ public class AccountServiceDaoImpl extends BaseServiceDao implements IAccountSer
     public List<Map> getAccountInfo(Map info) throws DAOException {
         logger.debug("查询账户信息 入参 info : {}", info);
 
-        List<Map> businessAccountInfos = sqlSessionTemplate.selectList("accountServiceDaoImpl.getAccountInfo", info);
+        List<Map> infos = sqlSessionTemplate.selectList("accountServiceDaoImpl.getAccountInfo", info);
 
-        return businessAccountInfos;
+        return infos;
     }
 
 
@@ -122,12 +122,12 @@ public class AccountServiceDaoImpl extends BaseServiceDao implements IAccountSer
     public int queryAccountsCount(Map info) {
         logger.debug("查询账户数据 入参 info : {}", info);
 
-        List<Map> businessAccountInfos = sqlSessionTemplate.selectList("accountServiceDaoImpl.queryAccountsCount", info);
-        if (businessAccountInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("accountServiceDaoImpl.queryAccountsCount", info);
+        if (infos.size() < 1) {
             return 0;
         }
 
-        return Integer.parseInt(businessAccountInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }
 
     /**

service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java

@@ -150,7 +150,7 @@ public class EditOwnerCmd extends Cmd {
         Assert.listOnlyOne(curOwners, "未查询到业主信息或查询到多条");
 
         OwnerDto ownerDto = new OwnerDto();
-        ownerDto.setLink(curOwners.get(0).getLink());
+        ownerDto.setLink(link);
         ownerDto.setCommunityId(reqJson.getString("communityId"));
         List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryAllOwners(ownerDto);
         if (ownerDtos != null && ownerDtos.size() > 1) {