TRX 1 anno fa
parent
commit
091f7228a1

+ 3 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/PayCallService.java

@@ -492,6 +492,7 @@ public class PayCallService extends SuperService {
             refundRecord.setExamineTime(System.currentTimeMillis());
             refundRecord.setRefuseRemark("退款成功");
             refundRecord.setRefundState(RefundState.Refunded);
+            refundRecord.setRefundTransactionIds(list);
             refundRecordService.saveEntity(refundRecord);
             return ResultContent.buildSuccess();
         } else {
@@ -600,11 +601,13 @@ public class PayCallService extends SuperService {
                 if (resultContent.getState() == ResultState.Success) {
                     expenseFlow.setRefundTransactionIds(resultContent.getContent());
                 }
+                refundRecordService.markState(param.getRefundOrderId(), RefundState.Refunded, resultContent.getContent());
             } else {
                 // 退款失败
                 expenseFlow.setIsRefund(Boolean.TRUE);
                 expenseFlow.setRefundState(RefundState.Fail);
                 expenseFlow.setRefuseRemark("退款失败");
+                refundRecordService.markState(param.getRefundOrderId(), RefundState.Fail);
             }
             expenseFlowDao.save(expenseFlow);
         }

+ 9 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/RefundRecordService.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.server.core.service.payment;
 
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.pay.client.model.ledger.TransactionLogModel;
 import com.zhongshu.card.client.type.RefundState;
 import com.zhongshu.card.server.core.dao.payment.RefundRecordDao;
 import com.zhongshu.card.server.core.domain.payment.RefundRecord;
@@ -11,6 +12,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 退款记录管理
  *
@@ -39,16 +42,21 @@ public class RefundRecordService extends SuperService {
      * @return
      */
     public ResultContent markState(String refundNo, RefundState refundState) {
+        markState(refundNo, refundState, null);
+        return ResultContent.buildSuccess();
+    }
+
+    public ResultContent markState(String refundNo, RefundState refundState, List<TransactionLogModel> transactionLogModelList) {
         if (StringUtils.isNotEmpty(refundNo) && refundState != null) {
             RefundRecord refundRecord = refundRecordDao.findTopByRefundNo(refundNo);
             if (ObjectUtils.isNotEmpty(refundRecord)) {
                 refundRecord.setRefundState(refundState);
                 refundRecord.setExamineTime(System.currentTimeMillis());
                 refundRecord.setRefuseRemark(refundRecord.getRefundRemark());
+                refundRecord.setRefundTransactionIds(refundRecord.getRefundTransactionIds());
                 refundRecordDao.save(refundRecord);
             }
         }
         return ResultContent.buildSuccess();
     }
-
 }