From ff9725c335c3ac0d5c64048b99cf4e1792a6fcdb Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 27 Jul 2023 15:52:17 +0800 Subject: [PATCH] =?UTF-8?q?updateupdate=20=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/api/uniapp/PayController.java | 1 + .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index 17addfd4a..4f5cfdcc4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -87,6 +87,7 @@ public class PayController extends BaseController { /** + * 汇付充值余额 * 会员充值余额 汇付 * http://localhost:8080/uniapp/pay/rechargeBalance */ 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 cc01716ee..7d4b989bb 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 @@ -2143,7 +2143,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { BigDecimal tradeFee = totalSettleAmount.multiply(new BigDecimal(Constants.FEE_RATES)); settleOrderReport.setTradeFee(tradeFee); settleOrderReport.setTradeAmount(totalSettleAmount.subtract(tradeFee)); - + // 根据站点id和交易日期查询 SettleOrderReport selectResult = settleOrderReportService.selectByStationIdAndDate(stationId, tradeDate); if (selectResult != null) { settleOrderReport.setId(selectResult.getId());