交易分账 重构

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

@@ -3,7 +3,6 @@ package com.jsowell.pile.service.impl;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
@@ -62,10 +61,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.ParseException;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -2499,8 +2495,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
             }
         }
 
-        // 不管是撤销还是退款，都需要更新memberAdapayRecord中的退款金额
-        memberAdapayRecordService.updateRefundAmount(paymentId, refundAmt);
+        // 不管是撤销还是退款，都需要更新memberAdapayRecord中的金额, 解冻金额就是支付的金额，退款金额就是订单结算后需要退的金额
+        memberAdapayRecordService.unfreezeAmountAndUpdateSpendAmount(paymentId, payAmt, refundAmt);
     }
 
     /**