Lianxun_Java.git

			@@ -17,7 +17,7 @@
			import com.java110.dto.owner.OwnerRoomRelDto;
			import com.java110.dto.repair.RepairDto;
			import com.java110.dto.repair.RepairUserDto;
			import com.java110.dto.userStorehouse.UserStorehouseDto;
			import com.java110.dto.user.UserStorehouseDto;
			import com.java110.intf.common.IFileInnerServiceSMO;
			import com.java110.intf.common.IFileRelInnerServiceSMO;
			import com.java110.intf.community.*;
			@@ -35,8 +35,8 @@
			import com.java110.po.owner.RepairPoolPo;
			import com.java110.po.owner.RepairUserPo;
			import com.java110.po.purchase.ResourceStorePo;
			import com.java110.po.resourceStoreUseRecord.ResourceStoreUseRecordPo;
			import com.java110.po.userStorehouse.UserStorehousePo;
			import com.java110.po.resource.ResourceStoreUseRecordPo;
			import com.java110.po.user.UserStorehousePo;
			import com.java110.utils.constant.FeeTypeConstant;
			import com.java110.utils.exception.CmdException;
			import com.java110.utils.util.Assert;
			@@ -57,7 +57,6 @@
			@Java110Cmd(serviceCode = "ownerRepair.repairFinish")
			public class RepairFinishCmd extends Cmd {


			@Autowired
			private IRepairUserInnerServiceSMO repairUserInnerServiceSMOImpl;

			@@ -66,9 +65,6 @@

			@Autowired
			private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;

			@Autowired
			private IFileInnerServiceSMO fileInnerServiceSMOImpl;

			@Autowired
			private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMO;
			@@ -102,6 +98,9 @@

			@Autowired
			private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;

			@Autowired
			private IFileInnerServiceSMO fileInnerServiceSMOImpl;

			@Override
			public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
			@@ -359,14 +358,14 @@
			repairUserDto.setRepairId(reqJson.getString("repairId"));
			repairUserDto.setCommunityId(reqJson.getString("communityId"));
			repairUserDto.setRepairEvent(RepairUserDto.REPAIR_EVENT_START_USER);
			repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
			if (repairUserDtos.size() != 1) {
			List<RepairUserDto> startRepairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
			if (startRepairUserDtos.size() != 1) {
			ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "数据错误该订单没有发起人！");
			context.setResponseEntity(responseEntity);
			return;
			}
			repairUserPo = new RepairUserPo();
			repairUserPo.setRuId("-1");
			repairUserPo.setRuId(GenerateCodeFactory.getGeneratorId("83"));
			repairUserPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
			if ("1001".equals(maintenanceType)) { //如果是有偿的就走下面(业主报修有偿或者电话申请有偿或者员工报修有偿)
			repairUserPo.setState(RepairUserDto.STATE_PAY_FEE);
			@@ -377,8 +376,8 @@
			}
			repairUserPo.setRepairId(reqJson.getString("repairId"));
			if ("Z".equals(repairChannel)) { //如果是业主端报修的走下面的方法
			repairUserPo.setStaffId(repairUserDtos.get(0).getStaffId());
			repairUserPo.setStaffName(repairUserDtos.get(0).getStaffName());
			repairUserPo.setStaffId(startRepairUserDtos.get(0).getStaffId());
			repairUserPo.setStaffName(startRepairUserDtos.get(0).getStaffName());
			} else { //如果不是业主报修，并且有偿
			RepairDto repairDto = new RepairDto();
			repairDto.setRepairId(reqJson.getString("repairId"));
			@@ -415,8 +414,8 @@
			repairUserPo.setStaffId(ownerId);
			repairUserPo.setStaffName(ownerName);
			}
			repairUserPo.setPreStaffId(userId);
			repairUserPo.setPreStaffName(userName);
			repairUserPo.setPreStaffId(repairUserDtos.get(0).getStaffId());
			repairUserPo.setPreStaffName(repairUserDtos.get(0).getStaffName());
			repairUserPo.setPreRuId(repairUserDtos.get(0).getRuId());
			repairUserPo.setRepairEvent(RepairUserDto.REPAIR_EVENT_PAY_USER);
			repairUserPo.setCommunityId(reqJson.getString("communityId"));
			@@ -429,22 +428,23 @@
			if (reqJson.containsKey("beforeRepairPhotos") && !StringUtils.isEmpty(reqJson.getString("beforeRepairPhotos"))) {
			JSONArray beforeRepairPhotos = reqJson.getJSONArray("beforeRepairPhotos");
			for (int _photoIndex = 0; _photoIndex < beforeRepairPhotos.size(); _photoIndex++) {
			FileDto fileDto = new FileDto();
			fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
			fileDto.setFileName(fileDto.getFileId());
			fileDto.setContext(beforeRepairPhotos.getJSONObject(_photoIndex).getString("photo"));
			fileDto.setSuffix("jpeg");
			fileDto.setCommunityId(reqJson.getString("communityId"));
			String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
			reqJson.put("ownerPhotoId", fileDto.getFileId());
			reqJson.put("fileSaveName", fileName);
			String photo = beforeRepairPhotos.getJSONObject(_photoIndex).getString("photo");
			if (photo.length() > 512) {
			FileDto fileDto = new FileDto();
			fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
			fileDto.setFileName(fileDto.getFileId());
			fileDto.setContext(photo);
			fileDto.setSuffix("jpeg");
			fileDto.setCommunityId(reqJson.getString("communityId"));
			photo = fileInnerServiceSMOImpl.saveFile(fileDto);
			}
			JSONObject businessUnit = new JSONObject();
			businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
			businessUnit.put("relTypeCd", FileRelDto.BEFORE_REPAIR_PHOTOS);
			businessUnit.put("saveWay", "ftp");
			businessUnit.put("objId", reqJson.getString("repairId"));
			businessUnit.put("fileRealName", fileName);
			businessUnit.put("fileSaveName", fileName);
			businessUnit.put("fileRealName", photo);
			businessUnit.put("fileSaveName", photo);
			FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
			flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
			if (flag < 1) {
			@@ -456,22 +456,23 @@
			if (reqJson.containsKey("afterRepairPhotos") && !StringUtils.isEmpty(reqJson.getString("afterRepairPhotos"))) {
			JSONArray afterRepairPhotos = reqJson.getJSONArray("afterRepairPhotos");
			for (int _photoIndex = 0; _photoIndex < afterRepairPhotos.size(); _photoIndex++) {
			FileDto fileDto = new FileDto();
			fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
			fileDto.setFileName(fileDto.getFileId());
			fileDto.setContext(afterRepairPhotos.getJSONObject(_photoIndex).getString("photo"));
			fileDto.setSuffix("jpeg");
			fileDto.setCommunityId(reqJson.getString("communityId"));
			String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
			reqJson.put("ownerFinishPhotoId", fileDto.getFileId());
			reqJson.put("fileFinishSaveName", fileName);
			String photo = afterRepairPhotos.getJSONObject(_photoIndex).getString("photo");
			if (photo.length() > 512) {
			FileDto fileDto = new FileDto();
			fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
			fileDto.setFileName(fileDto.getFileId());
			fileDto.setContext(photo);
			fileDto.setSuffix("jpeg");
			fileDto.setCommunityId(reqJson.getString("communityId"));
			photo = fileInnerServiceSMOImpl.saveFile(fileDto);
			}
			JSONObject businessUnit = new JSONObject();
			businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
			businessUnit.put("relTypeCd", FileRelDto.AFTER_REPAIR_PHOTOS);
			businessUnit.put("saveWay", "ftp");
			businessUnit.put("objId", reqJson.getString("repairId"));
			businessUnit.put("fileRealName", fileName);
			businessUnit.put("fileSaveName", fileName);
			businessUnit.put("fileRealName", photo);
			businessUnit.put("fileSaveName", photo);
			FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
			flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
			if (flag < 1) {
			@@ -531,6 +532,7 @@
			feePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
			feePo.setState(FeeDto.STATE_DOING);
			feePo.setUserId(userId);
			feePo.setbId("-1");

			flag = payFeeV1InnerServiceSMOImpl.savePayFee(feePo);
			if (flag < 1) {