Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -83,8 +83,8 @@
			responseJson = DataTransactionFactory.createBusinessResponseJson(businessServiceDataFlow, ResponseConstant.RESULT_CODE_ERROR, e.getMessage() + e,
			null);
			} finally {
			return responseJson.toJSONString();
			}
			return responseJson.toJSONString();
			}

			/**
			@@ -180,6 +180,24 @@
			feeDto.setCommunityId(communityId);
			return queryOweFeeImpl.query(feeDto);
			}
			/**
			* 查询欠费费用
			*
			* @param roomId 房屋ID
			* @param communityId 小区ID
			* @return
			* @path /app/feeApi/listAllRoomOweFees
			*/
			@RequestMapping(value = "/listAllRoomOweFees", method = RequestMethod.GET)
			public ResponseEntity<String> listAllRoomOweFees(
			@RequestParam(value = "roomId",required = false) String roomId,
			@RequestParam(value = "communityId") String communityId) {
			FeeDto feeDto = new FeeDto();
			feeDto.setPayerObjId(roomId);
			feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
			feeDto.setCommunityId(communityId);
			return queryOweFeeImpl.querys(feeDto);
			}

			/**
			* 查询欠费费用
			@@ -273,7 +291,7 @@

			/**
			* 车辆费用导入
			*
			* /feeApi/importCarFees
			* path /app/feeApi/importCarFees
			* @param reqString
			* @return
			@@ -290,4 +308,23 @@
			return importRoomFeeImpl.importCarFee(reqJson);
			}

			/**
			* 合同费用导入
			* /feeApi/importContractFees
			* path /app/feeApi/importContractFees
			* @param reqString
			* @return
			*/
			@RequestMapping(value = "/importContractFees", method = RequestMethod.POST)
			public ResponseEntity<String> importContractFees(@RequestBody String reqString) {

			JSONObject reqJson = JSONObject.parseObject(reqString);
			Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区信息");
			Assert.hasKeyAndValue(reqJson, "feeTypeCd", "未包含费用类型");
			Assert.hasKeyAndValue(reqJson, "storeId", "未包含商户信息");
			Assert.hasKeyAndValue(reqJson, "userId", "未包含用户信息");

			return importRoomFeeImpl.importContractFees(reqJson);
			}

			}