From e8e85af44422291582d859a6970020e68580b2a5 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Mon, 30 Dec 2024 11:41:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=8C=E6=99=93=E4=BD=99=E9=A2=9D=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsowell/api/uniapp/customer/PayController.java  | 2 +-
 .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 5 +----
 .../service/programlogic/NotDelayMerchantProgramLogic.java   | 3 +++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java
index 586e0dcab..a1476c99e 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java
@@ -145,7 +145,7 @@ public class PayController extends BaseController {
 			}
 			response = new RestApiResponse<>(map);
 		} catch (BusinessException e) {
-			logger.warn("支付订单接口 warn param:{}", dto, e);
+			logger.error("支付订单接口 warn param:{}", dto, e);
 			response = new RestApiResponse<>(e.getCode(), e.getMessage());
 		} catch (Exception e) {
 			logger.error("支付订单接口 error param:{}", dto, e);
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index b694dee91..2ea8c434e 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -2,7 +2,6 @@ package com.jsowell.pile.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.alipay.api.domain.ChargeOrderInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -3250,9 +3249,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
             BigDecimal remedialAmount = orderInfo.getRemedialAmount();
             orderInfo.setRemedialAmount(remedialAmount.subtract(payAmount));
         }
-
-
-
+        // 更新订单信息
         this.updateOrderBasicInfo(orderInfo);
     }
 
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 dbfbdb6be..11c3eb876 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
@@ -256,6 +256,9 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
             giftBalancePay = stringBigDecimalMap.get("giftBalancePay");
         }
 
+        // 更新支付金额 = 本金支付金额 + 赠送金支付金额
+        chargeAmount = principalBalancePay.add(giftBalancePay);
+
         // 更新会员钱包 全部金额都用于支付订单
         UpdateMemberBalanceDTO updateMemberBalanceDTO = UpdateMemberBalanceDTO.builder()
                 .memberId(memberId)