From 36e4beaea3c7cc2f05213e9fdf023b9685649e21 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 24 四月 2025 10:26:40 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
index 7fda18e..96a11c1 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
@@ -441,6 +441,13 @@
@Resource
private NativePayService nativePayService;
+ public static void main(String[] args) {
+ BigDecimal money = new BigDecimal(2);
+
+
+ System.err.println(money.multiply(new BigDecimal("0.9972")).setScale(2,BigDecimal.ROUND_DOWN));
+ }
+
@ApiOperation(value = "扫码支付",tags = {"后台2.0-加盟商列表余额"})
@PostMapping(value = "/code/buy")
public R buy(@RequestParam BigDecimal money) throws AlipayApiException, IOException {
@@ -579,7 +586,7 @@
// com.wechat.pay.java.service.payments.nativepay.model.PrepayResponse prepay = nativePayService.prepay(prepayRequest);
//预支付成功，创建预支付订单
TFranchiseeBalanceChange tFranchiseeBalanceChange = new TFranchiseeBalanceChange();
- tFranchiseeBalanceChange.setAmount(money);
+ tFranchiseeBalanceChange.setAmount(money.multiply(new BigDecimal("0.9972")).setScale(2,BigDecimal.ROUND_DOWN));
tFranchiseeBalanceChange.setIs_pay(0);
tFranchiseeBalanceChange.setFranchiseeName(byId.getName());
tFranchiseeBalanceChange.setFranchiseeId(String.valueOf(byId.getId()));
--
Gitblit v1.7.1