autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-13 22:40:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新会员交易记录的冻结金额

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-28 10:28:19 +08:00
parent ec70b74891
commit c76ba6dea0
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/service/MemberAdapayRecordService.java
View File

@@ -36,5 +36,5 @@ public interface MemberAdapayRecordService{
void updateFreezeAmount(String paymentId, BigDecimal amount); void updateFreezeAmount(String paymentId, BigDecimal amount);
void updateSpendAmountAndRefundAmount(String paymentId, BigDecimal SpendAmount, BigDecimal RefundAmount, BigDecimal freezeAmount); void updateSpendAmountAndRefundAmountAndFreezeAmount(String paymentId, BigDecimal SpendAmount, BigDecimal RefundAmount, BigDecimal freezeAmount);
} }

17
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberAdapayRecordServiceImpl.java
View File

@@ -82,34 +82,26 @@ public class MemberAdapayRecordServiceImpl implements MemberAdapayRecordService
/** /**
* 更新消费金额 * 更新消费金额
*
* @param paymentId
* @param amount
*/ */
@Override @Override
public void updateSpendAmount(String paymentId, BigDecimal amount) { public void updateSpendAmount(String paymentId, BigDecimal amount) {
updateSpendAmountAndRefundAmount(paymentId, amount, null, null); updateSpendAmountAndRefundAmountAndFreezeAmount(paymentId, amount, null, null);
} }
/** /**
* 更新剩余金额 * 更新剩余金额
*
* @param paymentId
* @param amount
*/ */
@Override @Override
public void updateRefundAmount(String paymentId, BigDecimal amount) { public void updateRefundAmount(String paymentId, BigDecimal amount) {
updateSpendAmountAndRefundAmount(paymentId, null, amount, null); updateSpendAmountAndRefundAmountAndFreezeAmount(paymentId, null, amount, null);
} }
/** /**
* 更新冻结金额 * 更新冻结金额
* @param paymentId
* @param amount
*/ */
@Override @Override
public void updateFreezeAmount(String paymentId, BigDecimal amount) { public void updateFreezeAmount(String paymentId, BigDecimal amount) {
updateSpendAmountAndRefundAmount(paymentId, null, null, amount); updateSpendAmountAndRefundAmountAndFreezeAmount(paymentId, null, null, amount);
} }
/** /**
@@ -118,9 +110,10 @@ public class MemberAdapayRecordServiceImpl implements MemberAdapayRecordService
* @param paymentId 支付id * @param paymentId 支付id
* @param SpendAmount 消费金额 * @param SpendAmount 消费金额
* @param RefundAmount 退款金额 * @param RefundAmount 退款金额
* @param freezeAmount 冻结金额
*/ */
@Override @Override
public void updateSpendAmountAndRefundAmount(String paymentId, BigDecimal SpendAmount, BigDecimal RefundAmount, BigDecimal freezeAmount) { public void updateSpendAmountAndRefundAmountAndFreezeAmount(String paymentId, BigDecimal SpendAmount, BigDecimal RefundAmount, BigDecimal freezeAmount) {
MemberAdapayRecord record = selectByPaymentId(paymentId); MemberAdapayRecord record = selectByPaymentId(paymentId);
if (record == null) { if (record == null) {
log.info("更新交易记录的消费金额和退款金额paymentId:{}, 查询为空", paymentId); log.info("更新交易记录的消费金额和退款金额paymentId:{}, 查询为空", paymentId);

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -2422,7 +2422,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// record.setBalanceAmt(record.getPayAmt().subtract(record.getRefundAmt()).subtract(record.getSpendAmt())); // record.setBalanceAmt(record.getPayAmt().subtract(record.getRefundAmt()).subtract(record.getSpendAmt()));
// memberAdapayRecordService.updateByPrimaryKeySelective(record); // memberAdapayRecordService.updateByPrimaryKeySelective(record);
memberAdapayRecordService.updateSpendAmountAndRefundAmount(paymentId, spendAmt, reverseAmt, null); memberAdapayRecordService.updateSpendAmountAndRefundAmountAndFreezeAmount(paymentId, spendAmt, reverseAmt, null);
// if (BigDecimal.ZERO.compareTo(record.getBalanceAmt()) != 0) { // if (BigDecimal.ZERO.compareTo(record.getBalanceAmt()) != 0) {
// logger.error("订单分账结束后账不平，paymentId:{}, orderCode:{}, 支付金额:{}, 消费金额:{}, 退款金额:{}", // logger.error("订单分账结束后账不平，paymentId:{}, orderCode:{}, 支付金额:{}, 消费金额:{}, 退款金额:{}",
// paymentId, dto.getOrderCode(), payAmt, spendAmt, reverseAmt); // paymentId, dto.getOrderCode(), payAmt, spendAmt, reverseAmt);
@@ -2448,7 +2448,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// } // }
// memberAdapayRecordService.updateByPrimaryKeySelective(record); // memberAdapayRecordService.updateByPrimaryKeySelective(record);
memberAdapayRecordService.updateSpendAmountAndRefundAmount(paymentId, spendAmt, refundAmt, null); memberAdapayRecordService.updateSpendAmountAndRefundAmountAndFreezeAmount(paymentId, spendAmt, refundAmt, null);
} }
} }
// if (StringUtils.equals("", payMode)) { // if (StringUtils.equals("", payMode)) {