Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -21,12 +21,15 @@

			public static final String PAYER_OBJ_TYPE_ROOM = "3333"; //房屋 6666 是车位
			public static final String PAYER_OBJ_TYPE_PARKING_SPACE = "6666";//是车位
			public static final String PAYER_OBJ_TYPE_CONTRACT = "7777";//是合同
			public static final String PAYER_OBJ_TYPE_CAR = "6666";//是车位
			public static final String PAYER_OBJ_TYPE_RENTING = "9999";//房源ID

			public static final String FEE_FLAG_ONCE = "2006012";
			public static final String FEE_FLAG_CYCLE = "1003006";
			public static final String FEE_FLAG_ONCE = "2006012";//一次性费用
			public static final String FEE_FLAG_CYCLE = "1003006";//周期性费用
			public static final String FEE_FLAG_CYCLE_ONCE = "4012024";//间接性费用
			public static final String REDIS_PAY_OWE_FEE = "PAY_OWE_FEE_";
			public static final String REDIS_PAY_TEMP_CAR_FEE = "PAY_TEMP_CAR_FEE_";

			private String amount;
			private String incomeObjId;
			@@ -50,6 +53,7 @@
			private String receivedAmountSwitch;

			private String squarePrice;
			private String mwPrice;
			private String additionalAmount;
			private String state;
			private String stateName;
			@@ -122,6 +126,15 @@
			//查询出的数量
			private int count;

			private String carTypeCd;
			private String cycle;
			private double feeTotalPrice;
			private String batchId;
			private String custEndTime;

			private String offlinePayFeeSwitch;

			private String deductFrom;

			public String getAmount() {
			return amount;
			@@ -579,4 +592,63 @@
			public void setComputingFormulaText(String computingFormulaText) {
			this.computingFormulaText = computingFormulaText;
			}

			public String getMwPrice() {
			return mwPrice;
			}

			public void setMwPrice(String mwPrice) {
			this.mwPrice = mwPrice;
			}

			public String getCarTypeCd() {
			return carTypeCd;
			}

			public void setCarTypeCd(String carTypeCd) {
			this.carTypeCd = carTypeCd;
			}

			public String getCycle() {
			return cycle;
			}

			public void setCycle(String cycle) {
			this.cycle = cycle;
			}

			public double getFeeTotalPrice() {
			return feeTotalPrice;
			}

			public void setFeeTotalPrice(double feeTotalPrice) {
			this.feeTotalPrice = feeTotalPrice;
			}

			public String getBatchId() {
			return batchId;
			}

			public void setBatchId(String batchId) {
			this.batchId = batchId;
			}

			public String getOfflinePayFeeSwitch() {
			return offlinePayFeeSwitch;
			}

			public void setOfflinePayFeeSwitch(String offlinePayFeeSwitch) {
			this.offlinePayFeeSwitch = offlinePayFeeSwitch;
			}

			public String getDeductFrom() { return deductFrom; }

			public void setDeductFrom(String deductFrom) { this.deductFrom = deductFrom; }
			public String getCustEndTime() {
			return custEndTime;
			}

			public void setCustEndTime(String custEndTime) {
			this.custEndTime = custEndTime;
			}
			}