Lianxun_Java.git

			@@ -3,7 +3,7 @@
			import com.alibaba.fastjson.JSONObject;
			import com.java110.core.annotation.Java110Cmd;
			import com.java110.core.context.ICmdDataFlowContext;
			import com.java110.core.event.cmd.AbstractServiceCmdListener;
			import com.java110.core.event.cmd.Cmd;
			import com.java110.core.event.cmd.CmdEvent;
			import com.java110.core.factory.GenerateCodeFactory;
			import com.java110.dto.RoomDto;
			@@ -24,6 +24,7 @@
			import com.java110.po.fee.FeeAttrPo;
			import com.java110.po.fee.PayFeePo;
			import com.java110.po.payFeeBatch.PayFeeBatchPo;
			import com.java110.utils.constant.CommonConstant;
			import com.java110.utils.exception.CmdException;
			import com.java110.utils.util.Assert;
			import com.java110.utils.util.BeanConvertUtil;
			@@ -39,7 +40,7 @@
			import java.util.List;

			@Java110Cmd(serviceCode = "fee.saveRoomCreateFee")
			public class SaveRoomCreateFeeCmd extends AbstractServiceCmdListener {
			public class SaveRoomCreateFeeCmd extends Cmd {

			private static final int DEFAULT_ADD_FEE_COUNT = 200;

			@@ -78,13 +79,7 @@
			//Assert.hasKeyAndValue(reqJson, "startTime", "未包含收费其实时间");
			//Assert.hasKeyAndValue(reqJson, "billType", "未包含出账类型");
			Assert.hasKeyAndValue(reqJson, "storeId", "未包含商户ID");
			}

			@Override
			public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
			String userId = cmdDataFlowContext.getResHeaders().get("user-id");
			reqJson.put("userId", userId);
			List<RoomDto> roomDtos = null;
			FeeConfigDto feeConfigDto = new FeeConfigDto();
			feeConfigDto.setCommunityId(reqJson.getString("communityId"));
			feeConfigDto.setConfigId(reqJson.getString("configId"));
			@@ -95,7 +90,7 @@
			reqJson.put("configEndTime", feeConfigDtos.get(0).getEndTime());


			if (FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag()) && reqJson.containsKey("endTime")) {
			if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag()) && reqJson.containsKey("endTime")) {
			Date endTime = null;
			Date configEndTime = null;
			try {
			@@ -108,6 +103,23 @@
			throw new IllegalArgumentException("结束时间错误" + reqJson.getString("endTime"));
			}
			}

			if (FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(feeConfigDtos.get(0).getComputingFormula())){
			Assert.hasKeyAndValue(reqJson, "rateCycle", "未包含递增周期");
			Assert.hasKeyAndValue(reqJson, "rate", "未包含递增率");
			Assert.hasKeyAndValue(reqJson, "rateStartTime", "未包含递增开始时间");
			reqJson.put("configComputingFormula",feeConfigDtos.get(0).getComputingFormula());
			}


			}

			@Override
			public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
			String userId = cmdDataFlowContext.getReqHeaders().get(CommonConstant.USER_ID);
			reqJson.put("userId", userId);
			List<RoomDto> roomDtos = null;


			//生成批次号
			generatorBatch(reqJson);
			@@ -211,28 +223,37 @@
			int saveFlag = 0;
			for (int roomIndex = 0; roomIndex < roomDtos.size(); roomIndex++) {
			curFailRoomCount++;
			//businesses.add();

			//加入房屋费用
			feePos.add(BeanConvertUtil.covertBean(feeBMOImpl.addRoomFee(roomDtos.get(roomIndex), reqJson, context), PayFeePo.class));
			if (!StringUtil.isEmpty(roomDtos.get(roomIndex).getOwnerId())) {
			if (FeeDto.FEE_FLAG_ONCE.equals(reqJson.getString("feeFlag"))) {
			if (!FeeDto.FEE_FLAG_CYCLE.equals(reqJson.getString("feeFlag"))) {
			feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
			reqJson.containsKey("endTime") ? reqJson.getString("endTime") : reqJson.getString("configEndTime")));
			}
			feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_ID, roomDtos.get(roomIndex).getOwnerId()));
			feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_LINK, roomDtos.get(roomIndex).getLink()));
			feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_NAME, roomDtos.get(roomIndex).getOwnerName()));
			//付费对象名称
			feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME,
			roomDtos.get(roomIndex).getFloorNum() + "-" + roomDtos.get(0).getUnitNum() + "-" + roomDtos.get(0).getRoomNum()));

			}

			//定制开发加入
			//1、对合同约定的租金递增比例、递增年限各不相同的问题，支持按合同到期日期设租金递增比例。
			//2、能自动设置递增的租金实行自动计算当月的租金。
			if(reqJson.containsKey("configComputingFormula")
			&& FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(reqJson.getString("configComputingFormula"))){
			feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_RATE_CYCLE, reqJson.getString("rateCycle")));
			feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_RATE, reqJson.getString("rate")));
			feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_RATE_START_TIME, reqJson.getString("rateStartTime")));
			}

			//付费对象名称
			feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME,
			roomDtos.get(roomIndex).getFloorNum() + "-" + roomDtos.get(roomIndex).getUnitNum() + "-" + roomDtos.get(roomIndex).getRoomNum()));

			if (roomIndex % DEFAULT_ADD_FEE_COUNT == 0 && roomIndex != 0) {
			saveFlag = saveFeeAndAttrs(feePos, feeAttrsPos);
			feePos = new ArrayList<>();
			feeAttrsPos = new ArrayList<>();
			if (saveFlag > 0) {
			if (saveFlag < 1) {
			failRooms += curFailRoomCount;
			} else {
			curFailRoomCount = 0;
			@@ -241,7 +262,7 @@
			}
			if (feePos != null && feePos.size() > 0) {
			saveFlag = saveFeeAndAttrs(feePos, feeAttrsPos);
			if (saveFlag > 0) {
			if (saveFlag < 1) {
			failRooms += curFailRoomCount;
			}
			}
			@@ -263,4 +284,6 @@

			return flag;
			}


			}