Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -3,6 +3,7 @@

			import com.alibaba.fastjson.JSONArray;
			import com.alibaba.fastjson.JSONObject;
			import com.java110.core.annotation.Java110Transactional;
			import com.java110.core.base.smo.BaseServiceSMO;
			import com.java110.dto.PageDto;
			import com.java110.dto.fee.BillDto;
			@@ -99,6 +100,29 @@
			}
			tmpFeeDto.setFeeAttrDtos(tmpFeeAttrDtos);
			}
			return fees;
			}

			@Override
			public List<FeeDto> querySimpleFees(@RequestBody FeeDto feeDto) {

			//校验是否传了分页信息
			int page = feeDto.getPage();

			if (page != PageDto.DEFAULT_PAGE) {
			feeDto.setPage((page - 1) * feeDto.getRow());
			}

			List<FeeDto> fees = BeanConvertUtil.covertBeanList(feeServiceDaoImpl.getFeeInfo(BeanConvertUtil.beanCovertMap(feeDto)), FeeDto.class);


			for (FeeDto tmpFeeDto : fees) {
			if (!StringUtil.isEmpty(tmpFeeDto.getImportFeeName())) {
			//fee.setFeeName(fee.getImportFeeName() + "(" + fee.getFeeName() + ")");
			tmpFeeDto.setFeeName(tmpFeeDto.getImportFeeName());
			}
			}

			return fees;
			}

			@@ -295,6 +319,7 @@
			}

			@Override
			@Java110Transactional
			public int updateFee(@RequestBody PayFeePo payFeePo) {
			feeServiceDaoImpl.updateFeeInfoInstance(BeanConvertUtil.beanCovertMap(payFeePo));
			return 1;
			@@ -310,6 +335,21 @@
			Map info = new HashMap();
			info.put("payFeePos", fees);
			return feeServiceDaoImpl.insertFees(info);
			}

			@Override
			@Java110Transactional
			public int saveOneFee(@RequestBody PayFeePo payFeePo) {
			List<Map> fees = new ArrayList<>();
			fees.add(BeanConvertUtil.beanCovertMap(payFeePo));
			Map info = new HashMap();
			info.put("payFeePos", fees);
			return feeServiceDaoImpl.insertFees(info);
			}

			@Override
			public int deleteFeesByBatch(@RequestBody PayFeePo payFeePo) {
			return feeServiceDaoImpl.deleteFeesByBatch(BeanConvertUtil.beanCovertMap(payFeePo));
			}

			@Override
			@@ -334,6 +374,7 @@
			return data;
			}


			private void dealFeeConfig(JSONArray data, FeeConfigDto tmpFeeConfigDto) {
			JSONObject config = new JSONObject();
			Map info = new HashMap();