pipIrr-SV.git - Gitblit

			@@ -76,6 +76,11 @@
			return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
			}

			// 依据水卡地址判断该卡是否可以开卡，未开过卡或不是正常状态、挂失状态的可开卡
			if(!cardOperateSv.canActiveCard(po.getCardAddr())) {
			return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_CARD_ESIST.getMessage());
			}

			Long clientId = po.getClientId();

			// 获取5级行政区划串areaCode
			@@ -153,7 +158,13 @@
			seCardOperate.setMoney(0f);
			seCardOperate.setCardCost(cardCost);
			seCardOperate.setPaymentId(paymentId);
			seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
			if(originalCardId != null) {
			// 补卡
			seCardOperate.setOperateType(OperateTypeENUM.REISSUE.getCode());
			}else {
			// 开新卡
			seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
			}
			seCardOperate.setRemarks(remarks);
			seCardOperate.setOperator(operator);
			seCardOperate.setOperateDt(activeTime);
			@@ -943,9 +954,9 @@

			try {
			QueryResultVo<List<VoOperate>> res = cardOperateSv.getCommonOperations(vo);
			if(res.itemTotal == 0) {
			return BaseResponseUtils.buildErrorMsg(SellResultCode.No_CANCELS.getMessage());
			}
			// if(res.itemTotal == 0) {
			// return BaseResponseUtils.buildErrorMsg(SellResultCode.No_CANCELS.getMessage());
			// }
			return BaseResponseUtils.buildSuccess(res);
			} catch (Exception e) {
			log.error("获取开卡记录异常", e);
			@@ -971,11 +982,11 @@
			@SsoAop()
			public BaseResponse<Map> getReceipts(QoReceipt vo){
			try {
			Map res = Optional.ofNullable(cardOperateSv.getReceipts(vo)).orElse(new HashMap());
			if(res.size() == 0) {
			return BaseResponseUtils.buildErrorMsg(SellResultCode.No_RECEIPTS.getMessage());
			}
			return BaseResponseUtils.buildSuccess(res);
			// Map res = Optional.ofNullable(cardOperateSv.getReceipts(vo)).orElse(new HashMap());
			// if(res.size() == 0) {
			// return BaseResponseUtils.buildErrorMsg(SellResultCode.No_RECEIPTS.getMessage());
			// }
			return BaseResponseUtils.buildSuccess(cardOperateSv.getReceipts(vo));
			} catch (Exception e) {
			log.error("获取电子钱包账户记录", e);
			return BaseResponseUtils.buildException(e.getMessage()) ;