pipIrr-SV.git - Gitblit

			@@ -6,6 +6,7 @@
			import com.dy.common.webUtil.BaseResponse;
			import com.dy.common.webUtil.BaseResponseUtils;
			import com.dy.common.webUtil.QueryResultVo;
			import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
			import com.dy.pipIrrGlobal.daoSe.SeCardOperateMapper;
			import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
			import com.dy.pipIrrGlobal.daoSe.SeClientMapper;
			@@ -52,6 +53,9 @@
			@Autowired
			private SeGeneralMapper seGeneralMapper;

			@Autowired
			private BaSettingsMapper baSettingsMapper;


			/**
			* 添加开卡记录
			@@ -68,8 +72,12 @@
			* @param clientNum 农户编号
			* @return 5级行政区划代码
			*/
			public Long getAreaCodeByNum(String clientNum) {
			return seClientMapper.getAreaCodeByNum(clientNum);
			public String getAreaCodeByNum(String clientNum) {
			Long areaCode = seClientMapper.getAreaCodeByNum(clientNum);
			if (areaCode == null) {
			return "";
			}
			return String.valueOf(areaCode);
			}

			/**
			@@ -131,7 +139,7 @@
			*/
			Long cardId = 0L;
			Long clientId = 0L;
			String cardNum = po.getCardNum();
			Long cardNum = po.getCardNum();
			Float money = po.getMoney();
			Float amount = po.getAmount();
			Float gift = po.getGift();
			@@ -144,7 +152,7 @@


			// 验证水卡状态是否支持当前操作
			String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(Long.parseLong(cardNum))).orElse("");
			String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse("");
			if(stateName.length() == 0 \|\| !stateName.equals("正常")) {
			return BaseResponseUtils.buildFail(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
			}
			@@ -199,7 +207,6 @@
			return BaseResponseUtils.buildSuccess(true) ;
			}


			/**
			* 根据指定条件获取充值记录
			* @param queryVo
			@@ -230,7 +237,6 @@
			rsVo.obj = seCardOperateMapper.getRecharges(params);
			return rsVo ;
			}


			/**
			* 根据指定条件获取交易记录
			@@ -291,7 +297,7 @@
			* @param queryVo
			* @return
			*/
			public QueryResultVo<List<VoActiveCardNew>> getActiveCards(QoActiveCard queryVo) {
			public QueryResultVo<List<VoActiveCard>> getActiveCards(QoActiveCard queryVo) {
			//完善查询充值记录的起止时间
			String activeTimeStart = queryVo.activeTimeStart;
			String activeTimeStop = queryVo.activeTimeStop;
			@@ -308,7 +314,7 @@

			Long itemTotal = seCardOperateMapper.getActiveCardRecordCount(params);

			QueryResultVo<List<VoActiveCardNew>> rsVo = new QueryResultVo<>() ;
			QueryResultVo<List<VoActiveCard>> rsVo = new QueryResultVo<>() ;

			rsVo.pageSize = queryVo.pageSize ;
			rsVo.pageCurr = queryVo.pageCurr ;
			@@ -351,6 +357,38 @@
			}

			/**
			* 根据指定条件获取IC卡注销记录
			* @param queryVo
			* @return
			*/
			public QueryResultVo<List<VoOperate>> getCommonOperations(QoCommonOperate queryVo) {
			//完善查询充值记录的起止时间
			String timeStart = queryVo.getTimeStart();
			String timeStop = queryVo.getTimeStop();
			if(timeStart != null) {
			timeStart = timeStart + " 00:00:00";
			queryVo.setTimeStart(timeStart);
			}
			if(timeStop != null) {
			timeStop = timeStop + " 23:59:59";
			queryVo.setTimeStop(timeStop);
			}

			Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);

			Long itemTotal = Optional.ofNullable(seCardOperateMapper.getCommonOperationRecordCount(params)).orElse(0L);

			QueryResultVo<List<VoOperate>> rsVo = new QueryResultVo<>() ;

			rsVo.pageSize = queryVo.pageSize ;
			rsVo.pageCurr = queryVo.pageCurr ;

			rsVo.calculateAndSet(itemTotal, params);
			rsVo.obj = seCardOperateMapper.getCommonOperations(params);
			return rsVo ;
			}

			/**
			* 根据指定条件获取收据列表
			* @param queryVo
			* @return
			@@ -385,4 +423,34 @@

			return map_result;
			}

			/**
			* 判断指定水卡是否为挂失状态且无补卡记录
			* @param cardNum 水卡编号
			* @return 是否已挂失未补卡
			*/
			public Boolean isLostAndUnreplaced(Long cardNum) {
			Integer rec = seClientCardMapper.isLostAndUnreplaced(cardNum);
			if(rec != null && rec > 0) {
			return false;
			}
			return true;
			}

			/**
			* 修改农户水卡
			* @param po
			* @return
			*/
			public Integer updateClientCard(SeClientCard po) {
			return seClientCardMapper.updateByPrimaryKeySelective(po);
			}

			/**
			* 获取项目编号
			* @return
			*/
			public String getProjectNo() {
			return baSettingsMapper.getItemValue("projectNo");
			}
			}