flowerbackend-v2.git

			@@ -188,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("提现记录信息不存在");
			}
			@@ -219,7 +220,7 @@
			try {
			if (recordLock.tryLock(10, 30, TimeUnit.SECONDS)) {
			try {
			if(!walletWithdrawRecordDTO.getApproveState().equals(Constants.WALLET_APPROVE_STATE.WAITING)){
			if(!approveState.equals(Constants.WALLET_APPROVE_STATE.WAITING.name())){
			String msg = "重复通过";
			throw new ValidationException(msg);
			}

			@@ -739,6 +739,7 @@
			try {
			//2024-10-28 直接保存到walletBillRecord
			//新增WalletBillRecordDO
			if(ois.getIncomeSupplier().compareTo(BigDecimal.ZERO) > 0) {
			WalletBillRecordDO walletBillRecord = new WalletBillRecordDO();
			walletBillRecord.setId(UUIDGenerator.getUUID());
			WalletDO walletDOInfo = walletService.getBySupplierId(supplierId);
			@@ -768,6 +769,7 @@
			walletMapper.updateById(walletDOInfo);
			walletBillRecord.create();
			walletBillRecordMapper.insert(walletBillRecord);
			}
			} finally {
			lock.unlock();
			}

			@@ -85,7 +85,7 @@
			<if test="dto.approveEndDate!=null ">
			AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') <= #{dto.approveEndDate}
			</if>
			order by t.create_time
			order by t.create_time desc
			</select>

			<select id="queryWalletBillRecordList" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">

	src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/wallet/WalletBillRecordMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史