希晓余额支付bug修复

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);

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);
     }
 

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)