pipIrr-SV.git - Gitblit

			@@ -10,10 +10,7 @@
			import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
			import com.dy.pipIrrGlobal.util.AmountToChinese;
			import com.dy.pipIrrGlobal.util.Constant;
			import com.dy.pipIrrGlobal.voSe.VoActiveCard;
			import com.dy.pipIrrGlobal.voSe.VoActiveCardNew;
			import com.dy.pipIrrGlobal.voSe.VoRecharge;
			import com.dy.pipIrrGlobal.voSe.VoReissueCard;
			import com.dy.pipIrrGlobal.voSe.*;
			import com.dy.pipIrrSell.cardOperate.converter.RechargeDtoMapper;
			import com.dy.pipIrrSell.cardOperate.dto.*;
			import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM;
			@@ -62,15 +59,6 @@
			* @param bindingResult
			* @return 水卡编号
			*/
			@Operation(summary = "开卡", description = "新开农户卡")
			@ApiResponses(value = {
			@ApiResponse(
			responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
			description = "操作结果：true：成功，false：失败（BaseResponse.content）",
			content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
			schema = @Schema(implementation = Boolean.class))}
			)
			})
			@PostMapping(path = "active", consumes = MediaType.APPLICATION_JSON_VALUE)
			@Transactional(rollbackFor = Exception.class)
			@SsoAop()
			@@ -80,7 +68,15 @@
			}

			// 获取5级行政区划串areaCode
			String areaCode = String.valueOf(cardOperateSv.getAreaCodeByNum(po.getClientNum()));
			String areaCode = cardOperateSv.getAreaCodeByNum(po.getClientNum());
			if(areaCode.trim().length() == 0) {
			return BaseResponseUtils.buildErrorMsg(SellResultCode.AREA_CODE_MISTAKE.getMessage());
			}

			// p206V1_0_1协议，将前6位行政区划改为100000
			if(po.getProtocol().trim().equals("p206V1_0_1")) {
			areaCode = "100000" + areaCode.substring(6);
			}

			/**
			* 根据行政区划串（areaCode）在水卡表中针对水卡编号（cardNum）进行模糊查询
			@@ -92,19 +88,19 @@
			if(cardNum != null && cardNum.trim().length() > 0) {
			Integer number = Integer.parseInt(cardNum.substring(12));
			number = number + 1;
			if(number > 9999) {
			return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_OVERRUN.getMessage());
			if(number > 65535) {
			return BaseResponseUtils.buildErrorMsg(SellResultCode.CARD_NUMBER_OVERRUN.getMessage());
			}
			cardNum = cardNum.substring(0, 12) + String.format("%04d", number);
			cardNum = cardNum.substring(0, 12) + String.format("%05d", number);
			} else {
			cardNum = areaCode + "0001";
			cardNum = areaCode + "00001";
			}

			/**
			* cardAddr 水卡地址（仅仅写入，无业务）
			* clientNum 农户编号
			* cardCost 卡片费用
			* amount 充值金额
			* amount 充值金额，充值接口为输入参数，补卡接口为原卡退还金额
			* reissueAmount 补卡金额，补卡时使用
			* paymentId 支付方式编号
			* remarks 备注
			@@ -114,6 +110,7 @@
			String cardAddr = po.getCardAddr();
			String clientNum = po.getClientNum();
			Integer cardCost = po.getCardCost();
			Long originalCardId = po.getOriginalCardId();
			Float amount = po.getAmount();
			Long paymentId = po.getPaymentId();
			String remarks = po.getRemarks();
			@@ -124,30 +121,34 @@
			* 根据农户编号获取农户ID
			*/
			Long clientId = cardOperateSv.getClientIdByNum(clientNum);
			if(clientId == null) {
			return BaseResponseUtils.buildErrorMsg(SellResultCode.CLIENT_NUM_ERROR.getMessage());
			}

			/**
			* 添加农户卡记录
			* 添加农户卡记录，退还金额作为当前余额
			*/
			SeClientCard seClientCard = new SeClientCard();
			seClientCard.setCardaddr(cardAddr);
			seClientCard.setCardnum(cardNum);
			seClientCard.setClientid(clientId);
			seClientCard.setMoney(0f);
			seClientCard.setMoney(amount);
			seClientCard.setState(CardStateENUM.NORMAL.getCode());
			seClientCard.setOriginalCardId(originalCardId);
			seClientCard.setCreatedt(activeTime);
			seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());

			Long cardId = Optional.ofNullable(clientCardSv.add(seClientCard)).orElse(0L) ;
			if(cardId == 0) {
			return BaseResponseUtils.buildFail(SellResultCode.ACTIVE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
			return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
			}

			/**
			* 添加开卡记录
			* 添加开卡记录，退还金额作为充值金额
			*/
			SeCardOperate seCardOperate = new SeCardOperate();
			seCardOperate.setCardId(cardId);
			seCardOperate.setClientId(clientId);
			seCardOperate.setMoney(amount);
			seCardOperate.setCardCost(cardCost);
			seCardOperate.setPaymentId(paymentId);
			seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
			@@ -156,14 +157,15 @@
			seCardOperate.setOperateDt(activeTime);
			Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
			if(rec == 0) {
			return BaseResponseUtils.buildFail(SellResultCode.ACTIVE_FAIL_WRITE_ACTIVE_CARD_ERROR.getMessage());
			return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_WRITE_ACTIVE_CARD_ERROR.getMessage());
			}

			/**
			* 如果操作人员开卡时输入了充值金额，则开卡后调用充值功能
			* 补卡除外，补卡的退还金额是从挂失卡中转移过来的，没有实际金钱交易
			*/
			po.setCardNum(cardNum);
			if(amount != null && amount > 0) {
			po.setCardNum(Long.parseLong(cardNum));
			if(amount != null && amount > 0 && originalCardId == null) {
			po.setClientId(clientId);
			DtoRecharge dtoRecharge = RechargeDtoMapper.INSTANCT.po2vo(po);
			dtoRecharge.setMoney(0f);
			@@ -171,12 +173,17 @@
			dtoRecharge.setPrice(0f);
			BaseResponse<Boolean> job = cardOperateSv.addRecharge(dtoRecharge);
			if(!job.getCode().equals("0001")) {
			return BaseResponseUtils.buildFail(SellResultCode.ACTIVE_FAIL_RECHARGE_EXCEPTION.getMessage());
			return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_RECHARGE_EXCEPTION.getMessage());
			}
			}

			if(po.getProtocol().trim().equals("p206V1_0_1")) {
			cardNum = cardNum.substring(6,12) + cardNum.substring(13);
			}

			Map map = new HashMap();
			map.put("projectCode", Constant.projectCode_ym);
			map.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
			map.put("orderNumber", cardId);
			map.put("cardNum", cardNum);
			return BaseResponseUtils.buildSuccess(map) ;
			}
			@@ -208,6 +215,7 @@
			* cardAddr 新的水卡地址（仅仅写入，无业务）
			* clientNum 农户编号，开新卡使用，通过老卡号获取
			* cardNum 水卡编号，传入的是老卡号，返回的是新卡号
			* cardId 原水卡（挂失水卡）ID，转移余额后需要更新卡余额为0
			* moeny 余额，挂失时使用
			* cardCost 卡片费用
			* paymentId 支付方式编号
			@@ -217,17 +225,17 @@

			String cardAddr = po.getCardAddr();
			String clientNum = "";
			String cardNum = po.getCardNum();
			Float money = po.getMoney();
			Long cardNum = po.getCardNum();
			Long cardId = 0L;
			Integer cardCost = po.getCardCost();
			Float reissueAmount = po.getReissueAmount();
			Long paymentId = po.getPaymentId();
			String remarks = po.getRemarks();
			Long operator = po.getOperator();

			// 验证水卡状态是否支持当前操作
			String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(Long.parseLong(cardNum))).orElse("");
			if(stateName.length() == 0 \|\| !stateName.equals("正常")) {
			return BaseResponseUtils.buildFail(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
			// 判断当前水卡是否为挂失状态且未补卡，仅已经挂失其未补卡的可以补卡
			if(!cardOperateSv.isLostAndUnreplaced(cardNum)) {
			return BaseResponseUtils.buildFail(SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
			}

			/**
			@@ -238,30 +246,25 @@
			return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
			}
			clientNum = map.get("clientNum").toString();
			cardId = Long.parseLong(map.get("cardId").toString());

			/**
			* 添加挂失记录
			* 如果是补卡调用的开卡且转移了退还金额，需修改挂失卡余额为0
			*/
			DtoLoss dtoLoss = new DtoLoss();
			dtoLoss.setCardNum(cardNum);
			dtoLoss.setMoney(money);
			dtoLoss.setRefund(0f);
			dtoLoss.setRemarks(remarks);
			dtoLoss.setOperator(operator);
			BaseResponse<java.lang.Boolean> baseResponse_addLoss = this.add_loss(dtoLoss, null);

			if(!baseResponse_addLoss.getCode().equals("0001")) {
			return BaseResponseUtils.buildFail(SellResultCode.REPLACE_FAIL_WRITE_RECHARGE_ERROR.getMessage());
			}
			SeClientCard seClientCard = new SeClientCard();
			seClientCard.setId(cardId);
			seClientCard.setMoney(0f);
			cardOperateSv.updateClientCard(seClientCard);

			/**
			* 添加开卡记录
			* 添加开卡记录，退还金额冲到新卡中
			*/
			DtoActiveCard dtoActiveCard = new DtoActiveCard();
			dtoActiveCard.setCardAddr(cardAddr);
			dtoActiveCard.setClientNum(clientNum);
			dtoActiveCard.setOriginalCardId(cardNum);
			dtoActiveCard.setCardCost(cardCost);
			dtoActiveCard.setAmount(0f);
			dtoActiveCard.setAmount(reissueAmount);
			dtoActiveCard.setPaymentId(paymentId);
			dtoActiveCard.setRemarks(remarks);
			dtoActiveCard.setOperator(operator);
			@@ -272,7 +275,7 @@
			}

			String theContent = String.valueOf(baseResponse_addActive.getContent());
			cardNum = theContent.substring(theContent.indexOf("=") + 1, theContent.indexOf(","));
			cardNum = Long.parseLong(theContent.substring(theContent.indexOf("=") + 1, theContent.indexOf(",")));

			Map map_response = new HashMap();
			map_response.put("projectCode", Constant.projectCode_ym);
			@@ -341,7 +344,7 @@
			*/
			Long cardId = 0L;
			Long clientId = 0L;
			String cardNum = po.getCardNum();
			Long cardNum = po.getCardNum();
			Float refund = po.getRefund();
			Byte refundType = po.getRefundType();
			String remarks = po.getRemarks();
			@@ -349,7 +352,7 @@
			Date cancelTime = new Date();

			// 验证水卡状态是否支持当前操作
			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());
			}
			@@ -437,7 +440,7 @@
			*/
			Long cardId = 0L;
			Long clientId = 0L;
			String cardNum = po.getCardNum();
			Long cardNum = po.getCardNum();
			Float money = po.getMoney();
			Float refund = po.getRefund();
			String remarks = po.getRemarks();
			@@ -445,7 +448,7 @@
			Date lossTime = new Date();

			// 验证水卡状态是否支持当前操作
			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());
			}
			@@ -484,6 +487,7 @@
			seCardOperate.setClientId(clientId);
			seCardOperate.setMoney(money);
			seCardOperate.setTradeAmount(-refund);
			seCardOperate.setPaymentId(1L);
			seCardOperate.setOperateType(OperateTypeENUM.LOSS.getCode());
			seCardOperate.setRemarks(remarks);
			seCardOperate.setOperator(operator);
			@@ -531,7 +535,7 @@
			*/
			Long cardId = 0L;
			Long clientId = 0L;
			String cardNum = po.getCardNum();
			Long cardNum = po.getCardNum();
			Float cardBalance = po.getCardBalance();
			Float systemBalance = po.getSystemBalance();
			String remarks = po.getRemarks();
			@@ -539,7 +543,7 @@
			Date reversalTime = new Date();

			// 验证水卡状态是否支持当前操作
			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());
			}
			@@ -624,7 +628,7 @@
			*/
			Long cardId = 0L;
			Long clientId = 0L;
			String cardNum = po.getCardNum();
			Long cardNum = po.getCardNum();
			Float money = po.getMoney();
			Float refund = po.getRefund();
			String remarks = po.getRemarks();
			@@ -632,7 +636,7 @@
			Date refundTime = new Date();

			// 验证水卡状态是否支持当前操作
			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());
			}
			@@ -708,9 +712,9 @@
			}

			/**
			* cardId 水卡编号（非传入参数，由cardAddr反查，修改农户卡使用）
			* cardId 水卡主键（非传入参数，由cardNum反查，修改农户卡使用）
			* clientId 农户编号（非传入参数，由cardNum反查）
			* cardNum 水卡地址
			* cardNum 水卡编号
			* money 余额
			* remarks 备注
			* operator 操作人编号
			@@ -718,16 +722,15 @@
			*/
			Long cardId = 0L;
			Long clientId = 0L;
			String cardNum = po.getCardNum();
			Long cardNum = po.getCardNum();
			Float money = po.getMoney();
			String remarks = po.getRemarks();
			Long operator = po.getOperator();
			Date unlockTime = new Date();

			// 验证水卡状态是否支持当前操作
			String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(Long.parseLong(cardNum))).orElse("");
			if(stateName.length() == 0 \|\| !stateName.equals("已挂失")) {
			return BaseResponseUtils.buildFail(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
			// 判断当前水卡是否为挂失状态且未补卡，仅已经挂失其未补卡的可以解锁
			if(!cardOperateSv.isLostAndUnreplaced(cardNum)) {
			return BaseResponseUtils.buildFail(SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
			}

			/**
			@@ -794,13 +797,15 @@
			public BaseResponse<QueryResultVo<List<VoRecharge>>> get(QoRecharge vo){
			try {
			QueryResultVo<List<VoRecharge>> res = cardOperateSv.getRecharges(vo);
			//if(res.itemTotal == 0) {
			// return BaseResponseUtils.buildFail(SellResultCode.No_RECHARGES.getMessage());
			//}
			return BaseResponseUtils.buildSuccess(res);
			} catch (Exception e) {
			log.error("获取充值记录异常", e);
			return BaseResponseUtils.buildException(e.getMessage()) ;
			}
			}


			/**
			* 根据指定条件获取交易明细
			@@ -828,7 +833,6 @@
			}
			}


			/**
			* 根据指定条件获取开卡记录
			* @param vo
			@@ -845,9 +849,9 @@
			})
			@GetMapping(path = "/getActiveCards")
			@SsoAop()
			public BaseResponse<QueryResultVo<List<VoActiveCardNew>>> getActiveCards(QoActiveCard vo){
			public BaseResponse<QueryResultVo<List<VoActiveCard>>> getActiveCards(QoActiveCard vo){
			try {
			QueryResultVo<List<VoActiveCardNew>> res = cardOperateSv.getActiveCards(vo);
			QueryResultVo<List<VoActiveCard>> res = cardOperateSv.getActiveCards(vo);
			if(res.itemTotal == 0) {
			return BaseResponseUtils.buildFail(SellResultCode.No_ActiveCards.getMessage());
			}
			@@ -857,8 +861,6 @@
			return BaseResponseUtils.buildException(e.getMessage()) ;
			}
			}



			/**
			* 根据指定条件获取补卡记录
			@@ -890,6 +892,43 @@
			}

			/**
			* 根据指定条件获取通用操作记录
			* 注销、挂失、冲正、解锁通用
			* 注销-3，挂失-6，冲正-7，解锁-8
			* @param vo
			* @return
			*/
			@Operation(summary = "获取通用操作记录", description = "返回通用操作记录")
			@ApiResponses(value = {
			@ApiResponse(
			responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
			description = "返回一页开卡数据（BaseResponse.content:QueryResultVo[{}]）",
			content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
			schema = @Schema(implementation = VoActiveCard.class))}
			)
			})
			@GetMapping(path = "/getOptions")
			@SsoAop()
			public BaseResponse<QueryResultVo<List<VoOperate>>> getCommonOperations(QoCommonOperate vo){
			// 验证操作类型是否正确
			Integer operateType = Optional.ofNullable(vo.getOperateType()).orElse(0);
			if(operateType != 3 && operateType != 6 && operateType != 7 && operateType != 8) {
			return BaseResponseUtils.buildFail(SellResultCode.PARAMS_ERROR.getMessage());
			}

			try {
			QueryResultVo<List<VoOperate>> res = cardOperateSv.getCommonOperations(vo);
			if(res.itemTotal == 0) {
			return BaseResponseUtils.buildFail(SellResultCode.No_CANCELS.getMessage());
			}
			return BaseResponseUtils.buildSuccess(res);
			} catch (Exception e) {
			log.error("获取开卡记录异常", e);
			return BaseResponseUtils.buildException(e.getMessage()) ;
			}
			}

			/**
			* 根据指定条件获取收据列表
			* @param vo
			* @return