flowerbackend-v2.git

			@@ -99,7 +99,6 @@
			if ("SUCCESS".equals(dStatus)) {
			walletBillRecordDO.setTransferState(Constants.SETTLEMENT_STATUS.COMPLETED.name());
			walletBillRecordDO.update("sys");
			walletBillRecordDO.setRemark("微信商户转账成功");
			walletBillRecordMapper.updateById(walletBillRecordDO);
			//更新钱包
			// WalletDO walletDO = walletService.getOrCreateBySupplierId(walletBillRecordDO.getWalletId());
			@@ -137,7 +136,7 @@
			// throw new RuntimeException(e);
			// }
			//回写提现状态
			if (StringUtils.isEmpty(walletBillRecordDO.getWithdrawRecordId())) {
			if (!StringUtils.isEmpty(walletBillRecordDO.getWithdrawRecordId())) {
			WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletBillRecordDO.getWithdrawRecordId());
			withdrawRecordDO.setWithdrawState(Constants.BILL_WITHDRAW_TYPE.success.name());
			walletBillRecordDO.setRemark("微信商户转账成功");
			@@ -187,10 +186,9 @@
			throw new RuntimeException(e);
			}
			//回写提现状态
			if (StringUtils.isEmpty(walletBillRecordDO.getWithdrawRecordId())) {
			if (!StringUtils.isEmpty(walletBillRecordDO.getWithdrawRecordId())) {
			WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletBillRecordDO.getWithdrawRecordId());
			withdrawRecordDO.setWithdrawState(Constants.BILL_WITHDRAW_TYPE.fail.name());
			walletBillRecordDO.setRemark("微信商户转账失败，余额返还钱包");
			walletWithdrawRecordMapper.updateById(withdrawRecordDO);
			}
			}

			@@ -269,6 +269,7 @@
			if(ObjectUtils.isEmpty(walletBillRecordDO)){
			throw new ValidationException("提现没有对应的账单信息");
			}
			walletBillRecordDO.setTransferId(transferReqDTO.getId());
			//提现金额
			BigDecimal withdrawAmount = withdrawRecordDO.getAmount();

			@@ -289,7 +290,7 @@
			transferReqDTO.setDetails(details);
			try {
			//发起转账
			paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
			paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
			} catch (Exception e) {
			throw new ValidationException(e.getMessage());
			}
			@@ -298,11 +299,9 @@
			//记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息
			walletBillRecordDO.setRemark("微信商户转账中");
			walletBillRecordDO.setActualTransferAmount(withdrawAmount);
			walletBillRecordDO.setId(UUIDGenerator.getUUID());
			walletBillRecordDO.setApproveBy(SecurityUtils.getUserId());
			walletBillRecordDO.setApproveTime(LocalDateTime.now());
			walletBillRecordService.updateById(walletBillRecordDO);
			// walletBillRecordMapper.insert(walletBillRecordDO);
			walletBillRecordMapper.updateById(walletBillRecordDO);
			//不需要更新结算单了，此时提现的金额和计算单上的金额不一致
			}
			} finally {

	src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史