flowerbackend-v2.git

			@@ -117,29 +117,44 @@

			// 1.新增一条余额提现记录
			WalletWithdrawRecordDO withdrawRecordDO = new WalletWithdrawRecordDO();
			//原金额
			withdrawRecordDO.setOriginalAmount(walletDO.getWithdrawableAmount());
			// 变动金额
			withdrawRecordDO.setChangeAmount(dto.getAmount());
			// 余额
			withdrawRecordDO.setBalance(walletDO.getWithdrawableAmount().subtract(dto.getAmount()));
			withdrawRecordDO.setAmount(dto.getAmount());
			withdrawRecordDO.setSupplierId(supplierDTO.getId());
			withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.WAITING.name());
			withdrawRecordDO.setWithdrawState(Constants.BILL_WITHDRAW_TYPE.start.name());
			withdrawRecordDO.setMethod(Constants.WALLET_WITHDRAW_METHOD.WEIXIN.name());
			withdrawRecordDO.setWithdrawType(Constants.WALLET_WITHDRAW_TYPE.BALANCE.name());
			// 待审核状态
			withdrawRecordDO.setApproveState(Constants.WALLET_APPROVE_STATE.WAITING.name());

			withdrawRecordDO.create(SecurityUtils.getUserId());

			// 保存余额提现记录
			save(withdrawRecordDO);

			/*

			// 2.新增一条账单明细
			WalletBillRecordDO walletBillRecordDO=new WalletBillRecordDO();
			walletBillRecordDO.setId(UUIDGenerator.getUUID());
			walletBillRecordDO.setSupplierId(supplierDTO.getId());
			walletBillRecordDO.setWalletId(walletDO.getId());
			// 提现
			walletBillRecordDO.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
			walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.add.name());
			// 发起提现
			walletBillRecordDO.setWithdrawType(Constants.BILL_WITHDRAW_TYPE.start.name());
			walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.reduce.name());
			walletBillRecordDO.setOriginalAmount(walletDO.getWithdrawableAmount());
			walletBillRecordDO.setChangeAmount(dto.getAmount());
			walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount().subtract(dto.getAmount()));
			walletBillRecordDO.create(SecurityUtils.getUserId());

			// 保存账单明细
			walletBillRecordService.save(walletBillRecordDO);
			*/



			// 3. 钱包更新
			// 钱包可提现的钱等于当前钱包可提现的钱-提现的钱
			@@ -173,6 +188,7 @@
			public void updateWallet(WalletWithdrawRecordDTO walletWithdrawRecordDTO) {

			WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletWithdrawRecordDTO.getId());
			final String approveState = withdrawRecordDO.getApproveState();
			if (withdrawRecordDO == null) {
			throw new ValidationException("提现记录信息不存在");
			}
			@@ -192,75 +208,148 @@
			withdrawRecordDO.setApproveState(walletWithdrawRecordDTO.getApproveState());
			withdrawRecordDO.setApproveBy(SecurityUtils.getUserId());
			withdrawRecordDO.setApproveTime(LocalDateTime.now());
			if(Constants.WALLET_APPROVE_STATE.REJECT.name().equals(walletWithdrawRecordDTO.getApproveState())){
			//如果拒绝直接提现失败
			withdrawRecordDO.setWithdrawState(Constants.BILL_WITHDRAW_TYPE.fail.name());
			}
			walletWithdrawRecordMapper.updateById(withdrawRecordDO);

			//审批通过之后写转账信息
			if (Constants.WALLET_APPROVE_STATE.APPROVE.name().equals(walletWithdrawRecordDTO.getApproveState())) {
			Supplier s = supplierMapper.selectById(withdrawRecordDO.getSupplierId());
			String name = "";
			name = "供应商" + s.getName();
			UserWechat wechat = wechatMapper.selectOne(new QueryWrapper<UserWechat>().eq("user_id", s.getUserId()));
			RLock recordLock = redissonClient.getLock(String.format(LockConstants.WALLET_WITHDRAW_RECORD_KEY, walletWithdrawRecordDTO.getId()));
			try {
			if (recordLock.tryLock(10, 30, TimeUnit.SECONDS)) {
			try {
			if(!approveState.equals(Constants.WALLET_APPROVE_STATE.WAITING.name())){
			String msg = "重复通过";
			throw new ValidationException(msg);
			}
			Supplier s = supplierMapper.selectById(withdrawRecordDO.getSupplierId());
			WalletDO walletDO = walletService.getOrCreateBySupplierId(s.getId());
			RLock lock = redissonClient.getLock(String.format(LockConstants.WALLET_ID_KEY, walletDO.getId()));
			try {
			if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
			try {
			if (!ObjectUtils.isEmpty(walletDO)) {
			String name = "";
			name = "供应商" + s.getName();
			UserWechat wechat = wechatMapper.selectOne(new QueryWrapper<UserWechat>().eq("user_id", s.getUserId()));

			if (wechat == null) {
			String msg = name + "未绑定账号无法结算";
			log.error(msg);
			throw new ValidationException(msg);
			}
			if (wechat == null) {
			String msg = name + "未绑定账号无法提现";
			log.error(msg);
			throw new ValidationException(msg);
			}

			LocalDateTime now = LocalDateTime.now();
			String day = format(now, "yyyy-MM-dd");
			String remarks = name + "钱包提现";
			String appId = PyamentV3Configurer.supplier_app_id;
			TransferReqDTO transferReqDTO = new TransferReqDTO();
			transferReqDTO.setId(UUIDGenerator.getUUID());
			transferReqDTO.setAppId(appId);
			transferReqDTO.setName(day + "日" + remarks);
			transferReqDTO.setRemarks(remarks);
			LocalDateTime now = LocalDateTime.now();
			String day = format(now, "yyyy-MM-dd");
			String remarks = name + "钱包提现";
			String appId = PyamentV3Configurer.supplier_app_id;
			TransferReqDTO transferReqDTO = new TransferReqDTO();
			transferReqDTO.setId(UUIDGenerator.getUUID());
			transferReqDTO.setAppId(appId);
			transferReqDTO.setName(day + "日" + remarks);
			transferReqDTO.setRemarks(remarks);

			//保存账单信息
			WalletBillRecordDO walletBillRecordDO = new WalletBillRecordDO();
			walletBillRecordDO.setSupplierId(s.getId());
			walletBillRecordDO.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
			walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.reduce.name());
			walletBillRecordDO.setTransferId(transferReqDTO.getAppId());
			//提现金额
			BigDecimal withdrawAmount = withdrawRecordDO.getAmount();
			//保存账单信息
			WalletBillRecordDO walletBillRecordDO = new WalletBillRecordDO();
			walletBillRecordDO.setSupplierId(s.getId());
			walletBillRecordDO.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
			walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.reduce.name());
			walletBillRecordDO.setTransferId(transferReqDTO.getId());
			walletBillRecordDO.setWithdrawRecordId(withdrawRecordDO.getId());
			walletBillRecordDO.create();
			walletBillRecordDO.setOriginalAmount(walletDO.getWithdrawableAmount());
			walletBillRecordDO.setChangeAmount(BigDecimal.ZERO);
			walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount());
			//提现金额
			BigDecimal withdrawAmount = withdrawRecordDO.getAmount();

			if (withdrawAmount.doubleValue() > 0) {//结算金额>0时才去转账
			TransferDetailReqDTO dr = new TransferDetailReqDTO();
			dr.setId(UUIDGenerator.getUUID());
			dr.setAmount(withdrawAmount.multiply(new BigDecimal(100)).longValue());
			dr.setOpenId(wechat.getOpenId());
			dr.setRemarks(remarks);
			if (withdrawAmount.doubleValue() >= 2000) {
			dr.setUserName(wechat.getRealName());
			if (withdrawAmount.doubleValue() > 0) {//结算金额>0时才去转账
			TransferDetailReqDTO dr = new TransferDetailReqDTO();
			dr.setId(UUIDGenerator.getUUID());
			dr.setAmount(withdrawAmount.multiply(new BigDecimal(100)).longValue());
			dr.setOpenId(wechat.getOpenId());
			dr.setRemarks(remarks);
			if (withdrawAmount.doubleValue() >= 2000) {
			dr.setUserName(wechat.getRealName());
			}

			List<TransferDetailReqDTO> details = new ArrayList<>();
			details.add(dr);
			walletBillRecordDO.setTransferDetailId(dr.getId());
			log.info("发起转账");
			transferReqDTO.setDetails(details);
			try {
			//发起转账
			// paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
			} catch (Exception e) {
			throw new ValidationException(e.getMessage());
			}
			}

			//记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息
			walletBillRecordDO.setRemark("账户资金提现中");
			walletBillRecordDO.setActualTransferAmount(withdrawAmount);
			walletBillRecordDO.setId(UUIDGenerator.getUUID());
			walletBillRecordMapper.insert(walletBillRecordDO);
			//不需要更新结算单了，此时提现的金额和计算单上的金额不一致
			}
			} finally {
			lock.unlock();
			}
			}
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}
			} finally {
			recordLock.unlock();
			}
			}

			List<TransferDetailReqDTO> details = new ArrayList<>();
			details.add(dr);
			walletBillRecordDO.setTransferDetailId(dr.getId());
			log.info("发起转账");
			transferReqDTO.setDetails(details);
			//发起转账
			paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}

			//记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息
			walletBillRecordDO.setTransferDetailId(Constants.TRANSFER_STATUS.ACCEPTED.name());
			walletBillRecordMapper.insert(walletBillRecordDO);
			//不需要更新结算单了，此时提现的金额和计算单上的金额不一致
			}

			if (Constants.WALLET_APPROVE_STATE.REJECT.name().equals(walletWithdrawRecordDTO.getApproveState())) {
			//更新钱包
			Supplier s = supplierMapper.selectById(withdrawRecordDO.getSupplierId());
			WalletDO walletDO = walletService.getBySupplierId(s.getId());
			if(!ObjectUtils.isEmpty(walletDO)){
			//提现中金额:审核失败体现中金额扣减
			walletDO.setWithdrawingAmount(walletDO.getWithdrawingAmount().subtract(withdrawRecordDO.getAmount()));
			//可提现金额:审核失败可提现金额增加
			walletDO.setWithdrawableAmount(walletDO.getWithdrawableAmount().add(withdrawRecordDO.getAmount()));
			walletMapper.updateById(walletDO);

			WalletDO walletDO = walletService.getOrCreateBySupplierId(s.getId());
			RLock lock = redissonClient.getLock(String.format(LockConstants.WALLET_ID_KEY, walletDO.getId()));
			try {
			if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
			try {
			if (!ObjectUtils.isEmpty(walletDO)) {
			// 2.新增一条账单明细
			WalletBillRecordDO walletBillRecordDO = new WalletBillRecordDO();
			walletBillRecordDO.setId(UUIDGenerator.getUUID());
			walletBillRecordDO.setSupplierId(walletDO.getSupplierId());
			walletBillRecordDO.setWalletId(walletDO.getId());
			walletBillRecordDO.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
			// 发起提现
			walletBillRecordDO.setWithdrawType(Constants.BILL_WITHDRAW_TYPE.fail.name());
			walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.add.name());
			walletBillRecordDO.setOriginalAmount(walletDO.getWithdrawableAmount());
			walletBillRecordDO.setChangeAmount(withdrawRecordDO.getAmount());
			walletBillRecordDO.setBalance(walletDO.getWithdrawableAmount().add(withdrawRecordDO.getAmount()));
			walletBillRecordDO.create(SecurityUtils.getUserId());
			walletBillRecordDO.setId(UUIDGenerator.getUUID());
			// 保存账单明细
			walletBillRecordService.save(walletBillRecordDO);

			//提现中金额:审核失败体现中金额扣减
			walletDO.setWithdrawingAmount(walletDO.getWithdrawingAmount().subtract(withdrawRecordDO.getAmount()));
			//可提现金额:审核失败可提现金额增加
			walletDO.setWithdrawableAmount(walletDO.getWithdrawableAmount().add(withdrawRecordDO.getAmount()));
			walletMapper.updateById(walletDO);
			}
			} finally {
			lock.unlock();
			}
			}
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}
			}
			}