pipIrr-SV.git - Gitblit

			@@ -107,6 +107,7 @@
			* operator 操作人编号
			* activeTime 开卡时间
			*/
			String protocol = po.getProtocol();
			String cardAddr = po.getCardAddr();
			Integer cardCost = po.getCardCost();
			Long originalCardId = po.getOriginalCardId();
			@@ -120,6 +121,7 @@
			* 添加农户卡记录，退还金额作为当前余额
			*/
			SeClientCard seClientCard = new SeClientCard();
			seClientCard.setProtocol(protocol);
			seClientCard.setCardaddr(cardAddr);
			seClientCard.setCardnum(cardNum);
			seClientCard.setClientid(clientId);
			@@ -207,6 +209,7 @@
			* operator 操作人编号
			*/

			String protocol;
			String cardAddr = po.getCardAddr();
			String clientNum = "";
			Long clientId = 0L;
			@@ -226,7 +229,7 @@
			// 如果传入了退还金额，需要判断老卡（被挂失的水卡）挂失时是否已经退款，无论退款多少都提示用户挂失时已退款
			if(reissueAmount != null && reissueAmount > 0) {
			Double tradeAmount = cardOperateSv.getTradeAmountByCardNo(cardNum);
			if(tradeAmount != null) {
			if(tradeAmount != null && tradeAmount > 0) {
			return BaseResponseUtils.buildErrorMsg(SellResultCode.THE_FEE_CANNOT_BE_REFUNDED.getMessage());
			}
			}
			@@ -241,6 +244,7 @@
			clientNum = map.get("clientNum").toString();
			cardId = Long.parseLong(map.get("cardId").toString());
			clientId = Long.parseLong(map.get("clientId").toString());
			protocol = map.get("protocol").toString();

			/**
			* 如果是补卡调用的开卡且转移了退还金额，需修改挂失卡余额为0
			@@ -256,6 +260,7 @@
			* 添加开卡记录，退还金额冲到新卡中
			*/
			ActiveCard activeCard = new ActiveCard();
			activeCard.setProtocol(protocol);
			activeCard.setCardAddr(cardAddr);
			activeCard.setClientId(clientId);
			activeCard.setOriginalCardId(cardId);
			@@ -279,6 +284,7 @@
			map_response.put("projectNo", projectNo);
			map_response.put("orderNumber", orderNumber);
			map_response.put("cardNum", cardNum);
			map_response.put("protocol", protocol);
			return BaseResponseUtils.buildSuccess(map_response) ;
			}