From 3677915b5ff5cdcad24f35eff10a7a861f8508b7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 13 十月 2025 09:52:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
index 7408e89..ae9a1e9 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -210,7 +210,7 @@
request.setOutTradeNo(orders.getOutTradeNo());
request.setNotifyUrl(WxMiniConfig.wxProperties.getNotifyUrl());//杩欎釜鍥炶皟url蹇呴』鏄痟ttps寮�澶寸殑
Amount amount = new Amount();
- amount.setTotal(1);//orders.getPayAccount().intValue());
+ amount.setTotal(orders.getPayAccount().intValue());
request.setAmount(amount);
// PrepayResponse res = WxMiniConfig.wxPayService.prepay(request);
// 璺熶箣鍓嶄笅鍗曠ず渚嬩竴鏍凤紝濉厖棰勪笅鍗曞弬鏁�
@@ -454,7 +454,7 @@
}
orders.setOriginPriceNum1(orders.getPriceNum1());
orders.setOriginPriceNum2(orders.getPriceNum2());
- orders.setOriginEstimatedAccount(orders.getOriginEstimatedAccount());
+ orders.setOriginEstimatedAccount(orders.getEstimatedAccount());
orders.setConfirmOtherFee(0L);
ordersMapper.updateById(orders);
}
--
Gitblit v1.9.3