pipIrr-SV.git - Gitblit

			@@ -5,10 +5,13 @@
			import com.dy.common.webUtil.BaseResponseUtils;
			import com.dy.common.webUtil.QueryResultVo;
			import com.dy.common.webUtil.ResultCodeMsg;
			import com.dy.pipIrrGlobal.pojoSe.*;
			import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
			import com.dy.pipIrrGlobal.pojoSe.SeRecharge;
			import com.dy.pipIrrGlobal.pojoSe.SeRechargeHistory;
			import com.dy.pipIrrGlobal.voSe.VoRecharge;
			import com.dy.pipIrrSell.clientCard.ClientCardSv;
			import com.dy.pipIrrSell.clientCard.LastOperateENUM;
			import com.dy.pipIrrSell.result.SellResultCode;
			import io.swagger.v3.oas.annotations.Operation;
			import io.swagger.v3.oas.annotations.Parameter;
			import io.swagger.v3.oas.annotations.media.Content;
			@@ -24,11 +27,7 @@
			import org.springframework.validation.BindingResult;
			import org.springframework.web.bind.annotation.*;

			import java.time.format.DateTimeFormatter;
			import java.util.Date;
			import java.util.List;
			import java.util.Objects;
			import java.util.Optional;
			import java.util.*;

			@Slf4j
			@Tag(name = "充值管理", description = "充值操作")
			@@ -48,9 +47,10 @@
			schema = @Schema(implementation = VoRecharge.class))}
			)
			})
			@GetMapping(path = "/getRecharges", consumes = MediaType.APPLICATION_JSON_VALUE)
			@SsoAop("-1")
			public BaseResponse<QueryResultVo<List<VoRecharge>>> get(@RequestBody @Parameter(description = "查询form表单json数据", required = true) QueryVo vo){
			//@GetMapping(path = "/getRecharges", consumes = MediaType.APPLICATION_JSON_VALUE)
			@GetMapping(path = "/getRecharges")
			@SsoAop()
			public BaseResponse<QueryResultVo<List<VoRecharge>>> get(QueryVo vo){
			try {
			QueryResultVo<List<VoRecharge>> res = rechargeSv.getRecharges(vo);
			return BaseResponseUtils.buildSuccess(res);
			@@ -71,17 +71,24 @@
			})
			@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
			@Transactional(rollbackFor = Exception.class)
			@SsoAop("-1")//@SsoAop(power = "-1")
			@SsoAop()
			public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form表单json数据", required = true) @Valid DtoRecharge po, @Parameter(hidden = true) BindingResult bindingResult){
			DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
			if(bindingResult != null && bindingResult.hasErrors()){
			return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
			}
			return addRecharge(po);
			}

			/**
			* 添加充值记录
			* @param po
			* @return
			*/
			public BaseResponse<Boolean> addRecharge(DtoRecharge po){
			/**
			* cardId 水卡编号（非传入参数，由cardAddr反查）
			* cardAddr 水卡地址
			* clientId 农户编号
			* cardId 水卡编号（插入记录后生成）
			* cardAddr 水卡地址（仅仅写入，无业务）
			* clientNum 农户编号（非传入参数，由cardNum反查，添加充值使用）
			* money 卡片余额
			* amount 充值金额
			* gift 赠送金额
			@@ -93,12 +100,14 @@
			* rechargeTime 充值时间
			*/
			Long cardId = 0L;
			String cardAddr = po.getCardAddr();
			Long clientId = po.getClientId();
			String cardNum = po.getCardNum();
			String clientNum = "";
			//Long clientId = po.getClientId();
			Long clientId = 0L;
			Float money = po.getMoney();
			Float amount = po.getAmount();
			Float gift = po.getGift();
			Float afterRecharge = po.getAfterRecharge();
			Float afterRecharge = money + amount + gift;
			Long paymentId = po.getPaymentId();
			Float price = po.getPrice();
			String remarks = po.getRemarks();
			@@ -106,12 +115,15 @@
			Date rechargeTime = new Date();

			/**
			* 依据水卡地址获取水卡编号（主键）
			* 依据水卡编号获取水卡表主键及农户编号
			*/
			cardId = Optional.ofNullable(clientCardSv.getCardIdByAddr(cardAddr)).orElse(0L);
			if(cardId == 0) {
			return BaseResponseUtils.buildFail("卡号错误，该卡不存在");
			Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
			if(map == null \|\| map.size() <= 0) {
			return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
			}
			cardId = Long.parseLong(map.get("cardId").toString());
			clientNum = map.get("clientNum").toString();
			clientId = Long.parseLong(map.get("clientId").toString());

			/**
			* 修改农户卡信息：
			@@ -124,7 +136,7 @@
			seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
			Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
			if(rec_updateClientCard == 0) {
			return BaseResponseUtils.buildFail("充值失败-农户卡修改异常");
			return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
			}

			/**
			@@ -135,6 +147,9 @@
			* 添加充值记录
			*/
			SeRecharge seRecharge = new SeRecharge();
			//seRecharge.setCardnum(cardNum);
			//seRecharge.setClientnum(clientNum);

			seRecharge.setCardid(cardId);
			seRecharge.setClientid(clientId);
			seRecharge.setMoney(money);
			@@ -148,13 +163,15 @@
			seRecharge.setOperatedt(rechargeTime);
			Long rec = Optional.ofNullable(rechargeSv.add(seRecharge)).orElse(0L);
			if(rec == 0) {
			return BaseResponseUtils.buildFail("充值失败-充值记录写入异常");
			return BaseResponseUtils.buildFail(SellResultCode.REPLACE_FAIL_WRITE_RECHARGE_ERROR.getMessage());
			}

			/**
			* 添加补卡历史记录
			*/
			SeRechargeHistory seRechargeHistory = new SeRechargeHistory();
			//seRechargeHistory.setCardnum(cardNum);
			//seRechargeHistory.setClientnum(clientNum);
			seRechargeHistory.setCardid(cardId);
			seRechargeHistory.setClientid(clientId);
			seRechargeHistory.setMoney(money);
			@@ -169,7 +186,7 @@

			Long rec_history = Optional.ofNullable(rechargeSv.addHistory(seRechargeHistory)).orElse(0L);
			if(rec_history == 0) {
			return BaseResponseUtils.buildFail("充值失败-充值历史记录写入异常");
			return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_FAIL_WRITE_RECHARGE_HISTORY_ERROR.getMessage());
			}

			return BaseResponseUtils.buildSuccess(true) ;