From 9e3c6fa190b1c59b2178ae1823c994684a4d9df3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 24 十月 2024 14:20:03 +0800
Subject: [PATCH] fix:结算
---
src/main/java/com/mzl/flower/service/wallet/WalletBillRecordService.java | 2 +
src/main/java/com/mzl/flower/mapper/wallet/WalletWithdrawRecordMapper.java | 2 +
src/main/java/com/mzl/flower/mapper/wallet/WalletBillRecordMapper.java | 2 +
src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java | 4 ++
src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java | 4 +-
src/main/java/com/mzl/flower/schedule/ScheduleService.java | 7 +++
src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java | 3 +
src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java | 9 ++++
src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java | 59 +++++++++++++++++++++++++++--
src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java | 5 +-
10 files changed, 87 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java b/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
index ce78d98..5a732f0 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
@@ -2,9 +2,7 @@
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.mzl.flower.base.BaseAutoEntity;
import com.mzl.flower.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -54,6 +52,9 @@
@ApiModelProperty(value = "转账明细id")
private String transferDetailId;
+ @ApiModelProperty(value = "转账状态")
+ private String transferState;
+
@ApiModelProperty(value = "openId")
private String openId;
diff --git a/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java b/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java
index 42c4b3b..73659ff 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java
@@ -75,5 +75,14 @@
@ApiModelProperty(value = "不通过原因")
private String rejectReason;
+ @ApiModelProperty(value = "原金额")
+ private BigDecimal originalAmount;
+
+ @ApiModelProperty(value = "变动金额")
+ private BigDecimal changeAmount;
+
+ @ApiModelProperty(value = "余额")
+ private BigDecimal balance;
+
}
diff --git a/src/main/java/com/mzl/flower/mapper/wallet/WalletBillRecordMapper.java b/src/main/java/com/mzl/flower/mapper/wallet/WalletBillRecordMapper.java
index 242d2d1..5167268 100644
--- a/src/main/java/com/mzl/flower/mapper/wallet/WalletBillRecordMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/wallet/WalletBillRecordMapper.java
@@ -2,6 +2,7 @@
import com.mzl.flower.entity.wallet.WalletBillRecordDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
/**
* <p>
@@ -11,6 +12,7 @@
* @author @TaoJie
* @since 2024-10-22
*/
+@Repository
public interface WalletBillRecordMapper extends BaseMapper<WalletBillRecordDO> {
}
diff --git a/src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java b/src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java
index e1116af..0fa6054 100644
--- a/src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java
@@ -3,8 +3,7 @@
import com.mzl.flower.entity.wallet.WalletDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Select;
-
-import java.math.BigDecimal;
+import org.springframework.stereotype.Repository;
/**
* <p>
@@ -14,6 +13,7 @@
* @author @TaoJie
* @since 2024-10-22
*/
+@Repository
public interface WalletMapper extends BaseMapper<WalletDO> {
diff --git a/src/main/java/com/mzl/flower/mapper/wallet/WalletWithdrawRecordMapper.java b/src/main/java/com/mzl/flower/mapper/wallet/WalletWithdrawRecordMapper.java
index 43e95b8..98bc6e8 100644
--- a/src/main/java/com/mzl/flower/mapper/wallet/WalletWithdrawRecordMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/wallet/WalletWithdrawRecordMapper.java
@@ -6,6 +6,7 @@
import com.mzl.flower.entity.wallet.WalletWithdrawRecordDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
import java.util.List;
@@ -17,6 +18,7 @@
* @author @TaoJie
* @since 2024-10-22
*/
+@Repository
public interface WalletWithdrawRecordMapper extends BaseMapper<WalletWithdrawRecordDO> {
List<WalletWithdrawRecordVO> queryPage(@Param("dto")QueryWalletWithdrawDTO queryWalletDTO, Page page);
diff --git a/src/main/java/com/mzl/flower/schedule/ScheduleService.java b/src/main/java/com/mzl/flower/schedule/ScheduleService.java
index 564098f..5c56a42 100644
--- a/src/main/java/com/mzl/flower/schedule/ScheduleService.java
+++ b/src/main/java/com/mzl/flower/schedule/ScheduleService.java
@@ -18,6 +18,7 @@
import com.mzl.flower.service.flower.FlowerCategoryService;
import com.mzl.flower.service.menber.impl.GrowthValueDealService;
import com.mzl.flower.service.payment.*;
+import com.mzl.flower.service.wallet.WalletBillRecordService;
import com.mzl.flower.thread.FlowerCategoryPriceThread;
import com.mzl.flower.utils.SmsUtil;
import lombok.extern.slf4j.Slf4j;
@@ -85,6 +86,10 @@
@Autowired
private BaseService baseService;
+
+ @Autowired
+ private WalletBillRecordService walletBillRecordService;
+
@Scheduled(cron = "1 1 0/2 * * ?")
public void calculateAvePrice() {
@@ -187,6 +192,8 @@
try {
paymentV3Service.checkTransferStatus(t);
settlementService.updateSettlementStatus(t.getId());
+ //2024-10-24更新钱包提现信息
+ walletBillRecordService.updateTransferStatus(t.getId());
} catch (Exception e) {
log.error(e.getMessage(), e);
}
diff --git a/src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java
index 13ffa86..b8ab819 100644
--- a/src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java
@@ -1,19 +1,22 @@
package com.mzl.flower.service.impl.wallet;
-import com.mzl.flower.config.exception.ValidationException;
-import com.mzl.flower.config.security.SecurityUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mzl.flower.constant.Constants;
import com.mzl.flower.dto.request.wallet.CreateWalletBillRecordDTO;
-import com.mzl.flower.dto.response.supplier.SupplierDTO;
+import com.mzl.flower.entity.payment.Transfer;
+import com.mzl.flower.entity.payment.TransferDetail;
import com.mzl.flower.entity.wallet.WalletBillRecordDO;
import com.mzl.flower.entity.wallet.WalletDO;
+import com.mzl.flower.mapper.payment.TransferDetailMapper;
+import com.mzl.flower.mapper.payment.TransferMapper;
import com.mzl.flower.mapper.wallet.WalletBillRecordMapper;
-import com.mzl.flower.service.supplier.SupplierService;
import com.mzl.flower.service.wallet.WalletBillRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mzl.flower.service.wallet.WalletService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -26,10 +29,56 @@
@Service
public class WalletBillRecordServiceImpl extends ServiceImpl<WalletBillRecordMapper, WalletBillRecordDO> implements WalletBillRecordService {
+ @Resource
+ private TransferMapper transferMapper;
+
+ @Resource
+ private TransferDetailMapper transferDetailMapper;
+
+ @Resource
+ private WalletBillRecordMapper walletBillRecordMapper;
+
+ @Resource
+ private WalletService walletService;
@Override
public void create(CreateWalletBillRecordDTO dto) {
}
+
+ public void updateTransferStatus(String transferId) {
+ Transfer t = transferMapper.selectById(transferId);
+ if ("FINISHED".equals(t.getStatus())) {
+ WalletBillRecordDO walletBillRecordDO = walletBillRecordMapper.selectOne(new QueryWrapper<WalletBillRecordDO>().eq("transfer_id", transferId));
+ if (walletBillRecordDO == null) {
+ return;
+ }
+ String transferDetailId = walletBillRecordDO.getTransferDetailId();
+ TransferDetail td = transferDetailMapper.selectById(transferDetailId);
+ if (td == null) {
+ log.warn("未找到对应明细");
+ return;
+ }
+ String dStatus = td.getStatus();
+ if ("SUCCESS".equals(dStatus)) {
+ walletBillRecordDO.setTransferState(Constants.SETTLEMENT_STATUS.COMPLETED.name());
+ walletBillRecordDO.update("sys");
+ walletBillRecordMapper.updateById(walletBillRecordDO);
+ //更新钱包
+ WalletDO walletDO = walletService.getBySupplierId(walletBillRecordDO.getWalletId());
+ if(!ObjectUtils.isEmpty(walletDO)){
+ //体现中金额
+ walletDO.setWithdrawingAmount(walletDO.getWithdrawingAmount().subtract(walletBillRecordDO.getChangeAmount()));
+ //已提现金额
+ walletDO.setWithdrawnAmount(walletDO.getWithdrawnAmount().add(walletBillRecordDO.getChangeAmount()));
+ }
+
+ } else if ("FAIL".equals(dStatus)) {
+ walletBillRecordDO.setTransferState(Constants.SETTLEMENT_STATUS.FAILED.name());
+ walletBillRecordDO.update("sys");
+ walletBillRecordMapper.updateById(walletBillRecordDO);
+ }
+ }
+ }
}
diff --git a/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java
index 35abe09..3292bd0 100644
--- a/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java
@@ -241,9 +241,10 @@
paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
}
+ //记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息
+ walletBillRecordDO.setTransferDetailId(Constants.TRANSFER_STATUS.ACCEPTED.name());
walletBillRecordMapper.insert(walletBillRecordDO);
//不需要更新结算单了，此时提现的金额和计算单上的金额不一致
-
}
}
public String format(LocalDateTime dateTime, String format) {
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java b/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
index 3fa2f6a..861f84f 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
@@ -783,6 +783,7 @@
WalletDO walletDOInfo = walletService.getCurrentSupplier();
//增加供应商结算金额保存到钱包
walletBillRecord.setSupplierId(s.getId());
+ walletBillRecord.setWalletId(walletDOInfo.getId());
walletBillRecord.setSettlementId(settlement.getId());
walletBillRecord.setType(Constants.BILL_CHANGE_TYPE.settlement.name());
walletBillRecord.setMethod(Constants.BILL_CHANGE_METHOD.add.name());
@@ -790,7 +791,10 @@
walletBillRecord.setChangeAmount(settlementAmount);
walletBillRecord.setBalance(walletDOInfo.getTotalAmount().add(settlementAmount));
//更新钱包
+ //总金额
walletDOInfo.setTotalAmount(walletBillRecord.getBalance());
+ //可提现金额=钱包余额=结算金额
+ walletDOInfo.setWithdrawableAmount(walletDOInfo.getWithdrawableAmount().add(settlementAmount));
walletMapper.updateById(walletDOInfo);
walletBillRecordMapper.insert(walletBillRecord);
} finally {
diff --git a/src/main/java/com/mzl/flower/service/wallet/WalletBillRecordService.java b/src/main/java/com/mzl/flower/service/wallet/WalletBillRecordService.java
index 0ab4c6f..85e8b01 100644
--- a/src/main/java/com/mzl/flower/service/wallet/WalletBillRecordService.java
+++ b/src/main/java/com/mzl/flower/service/wallet/WalletBillRecordService.java
@@ -15,4 +15,6 @@
public interface WalletBillRecordService extends IService<WalletBillRecordDO> {
void create(CreateWalletBillRecordDTO dto);
+
+ void updateTransferStatus(String transferId);
}
--
Gitblit v1.9.3