diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
index cb750df5d..2bda3f00b 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
@@ -475,6 +475,10 @@ public abstract class AbstractProgramLogic implements InitializingBean {
 
         BigDecimal tempAmount = new BigDecimal(orderAmount.toString()); // 临时金额
         for (OrderPayRecord record : payRecordList) {
+            if (!StringUtils.equals(record.getPayMode(), OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue())) {
+                // 不是本金支付, 进行下一个循环
+                continue;
+            }
             List<PaymentInfo> paymentInfos = orderPayRecordService.parseDeductionRecord(record.getDeductionRecord());
             for (PaymentInfo object : paymentInfos) {
                 String paymentId = object.getPaymentId();
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
index 12bec2532..3ab27ab0c 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
@@ -718,7 +718,8 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
         // 查支付记录
         List<OrderPayRecord> payRecordList = orderPayRecordService.getOrderPayRecordList(orderCode);
         // 根据payMode分组
-        Map<String, List<OrderPayRecord>> payRecordMap = payRecordList.stream().collect(Collectors.groupingBy(OrderPayRecord::getPayMode));
+        Map<String, List<OrderPayRecord>> payRecordMap = payRecordList.stream()
+                .collect(Collectors.groupingBy(OrderPayRecord::getPayMode));
         // 获取本金支付的记录
         List<OrderPayRecord> principalPayRecordList = payRecordMap.get(OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue());
         BigDecimal principalPay = null;
@@ -737,7 +738,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
         // 计算需要退回的金额
         Map<String, BigDecimal> returnAmountMap = calculateReturnAmount(principalPay, giftPay, orderAmount, discountAmount);
         logger.info("结算订单:{}, 剩余金额退回余额, 订单消费金额:{}, 本金支付金额:{}, 赠送支付金额:{}, 退回金额map:{}",
-                orderCode, orderAmount, principalPay, null, JSON.toJSONString(returnAmountMap));
+                orderCode, orderAmount, principalPay, giftPay, JSON.toJSONString(returnAmountMap));
 
         // 需要退回本金的金额
         BigDecimal returnPrincipal = returnAmountMap.get("returnPrincipal");
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
index 9b554e160..147db42fd 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
@@ -687,24 +687,35 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
         // 查支付记录
         List<OrderPayRecord> payRecordList = orderPayRecordService.getOrderPayRecordList(orderCode);
 
-        Map<String, OrderPayRecord> payRecordMap = payRecordList.stream()
-                .collect(Collectors.toMap(OrderPayRecord::getPayMode, Function.identity(), (k1, k2) -> k1));
-        // 取出本金支付金额
-        BigDecimal principalPay = null;
+        // 根据payMode分组
+        Map<String, List<OrderPayRecord>> payRecordMap = payRecordList.stream()
+                .collect(Collectors.groupingBy(OrderPayRecord::getPayMode));
 
         // 获取本金支付的记录
-        OrderPayRecord principalPayRecord = payRecordMap.get(Constants.ONE);
-        if (principalPayRecord != null) {
-            principalPay = principalPayRecord.getPayAmount();
+        List<OrderPayRecord> principalPayRecordList = payRecordMap.get(OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue());
+        BigDecimal principalPay = null;
+        if (CollectionUtils.isNotEmpty(principalPayRecordList)) {
+            principalPay = principalPayRecordList.stream().map(OrderPayRecord::getPayAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
         }
 
+        // 获取赠送金支付的记录
+        List<OrderPayRecord> giftPayRecordList = payRecordMap.get(OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue());
+        BigDecimal giftPay = null;
+        if (CollectionUtils.isNotEmpty(giftPayRecordList)) {
+            giftPay = giftPayRecordList.stream().map(OrderPayRecord::getPayAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        }
+
+        BigDecimal discountAmount = orderBasicInfo.getDiscountAmount() == null ? BigDecimal.ZERO : orderBasicInfo.getDiscountAmount();
+
         // 计算需要退回的金额
-        Map<String, BigDecimal> returnAmountMap = calculateReturnAmount(principalPay, null, orderAmount);
+        Map<String, BigDecimal> returnAmountMap = calculateReturnAmount(principalPay, giftPay, orderAmount, discountAmount);
         logger.info("结算订单:{}, 剩余金额退回余额, 订单消费金额:{}, 本金支付金额:{}, 赠送支付金额:{}, 退回金额map:{}",
-                orderCode, orderAmount, principalPay, null, JSON.toJSONString(returnAmountMap));
+                orderCode, orderAmount, principalPay, giftPay, JSON.toJSONString(returnAmountMap));
 
         // 需要退回本金的金额
         BigDecimal returnPrincipal = returnAmountMap.get("returnPrincipal");
+        // 需要退回赠送金的金额
+        BigDecimal returnGift = returnAmountMap.get("returnGift");
 
         // 更新会员钱包/余额退回到钱包
         UpdateMemberBalanceDTO updateMemberBalanceDTO = UpdateMemberBalanceDTO.builder()
@@ -712,6 +723,7 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
                 .type(MemberWalletEnum.TYPE_IN.getValue()) // 进账
                 .subType(MemberWalletEnum.SUBTYPE_ORDER_SETTLEMENT_REFUND.getValue()) // 订单结算退款
                 .updatePrincipalBalance(returnPrincipal)
+                .updateGiftBalance(returnGift)
                 .relatedOrderCode(orderCode)
                 .build();
         memberBasicInfoService.updateMemberBalance(updateMemberBalanceDTO);