Lianxun_Java.git

			@@ -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;
			@@ -115,7 +116,7 @@
			List<FeeDto> fees = BeanConvertUtil.covertBeanList(feeServiceDaoImpl.getFeeInfo(BeanConvertUtil.beanCovertMap(feeDto)), FeeDto.class);


			for(FeeDto tmpFeeDto : fees) {
			for (FeeDto tmpFeeDto : fees) {
			if (!StringUtil.isEmpty(tmpFeeDto.getImportFeeName())) {
			//fee.setFeeName(fee.getImportFeeName() + "(" + fee.getFeeName() + ")");
			tmpFeeDto.setFeeName(tmpFeeDto.getImportFeeName());
			@@ -318,6 +319,7 @@
			}

			@Override
			@Java110Transactional
			public int updateFee(@RequestBody PayFeePo payFeePo) {
			feeServiceDaoImpl.updateFeeInfoInstance(BeanConvertUtil.beanCovertMap(payFeePo));
			return 1;
			@@ -330,6 +332,16 @@
			fees.add(BeanConvertUtil.beanCovertMap(payFeePo));
			}

			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);
			@@ -361,7 +373,6 @@

			return data;
			}



			private void dealFeeConfig(JSONArray data, FeeConfigDto tmpFeeConfigDto) {