From 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 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 003d70a..df00a10 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
@@ -408,7 +408,7 @@
TFranchiseeBalanceChange tFranchiseeBalanceChange = new TFranchiseeBalanceChange();
- tFranchiseeBalanceChange.setAmount(money.multiply(new BigDecimal("0.9972")).setScale(2,BigDecimal.ROUND_DOWN));
+ tFranchiseeBalanceChange.setAmount(money.multiply(new BigDecimal("0.9962")).setScale(2,BigDecimal.ROUND_DOWN));
tFranchiseeBalanceChange.setIs_pay(0);
tFranchiseeBalanceChange.setFranchiseeName(byId.getName());
tFranchiseeBalanceChange.setFranchiseeId(String.valueOf(byId.getId()));
@@ -451,7 +451,7 @@
BigDecimal money = new BigDecimal(2);
- System.err.println(money.multiply(new BigDecimal("0.9972")).setScale(2,BigDecimal.ROUND_DOWN));
+ System.err.println(money.multiply(new BigDecimal("0.9962")).setScale(2,BigDecimal.ROUND_DOWN));
}
@ApiOperation(value = "扫码支付",tags = {"后台2.0-加盟商列表余额"})
@@ -510,7 +510,7 @@
// com.wechat.pay.java.service.payments.nativepay.model.PrepayResponse prepay = nativePayService.prepay(prepayRequest);
//预支付成功，创建预支付订单
TFranchiseeBalanceChange tFranchiseeBalanceChange = new TFranchiseeBalanceChange();
- tFranchiseeBalanceChange.setAmount(money.multiply(new BigDecimal("0.9972")).setScale(2,BigDecimal.ROUND_DOWN));
+ tFranchiseeBalanceChange.setAmount(money.multiply(new BigDecimal("0.9962")).setScale(2,BigDecimal.ROUND_DOWN));
tFranchiseeBalanceChange.setIs_pay(0);
tFranchiseeBalanceChange.setFranchiseeName(byId.getName());
tFranchiseeBalanceChange.setFranchiseeId(String.valueOf(byId.getId()));
@@ -592,7 +592,7 @@
// com.wechat.pay.java.service.payments.nativepay.model.PrepayResponse prepay = nativePayService.prepay(prepayRequest);
//预支付成功，创建预支付订单
TFranchiseeBalanceChange tFranchiseeBalanceChange = new TFranchiseeBalanceChange();
- tFranchiseeBalanceChange.setAmount(money.multiply(new BigDecimal("0.9972")).setScale(2,BigDecimal.ROUND_DOWN));
+ tFranchiseeBalanceChange.setAmount(money.multiply(new BigDecimal("0.9962")).setScale(2,BigDecimal.ROUND_DOWN));
tFranchiseeBalanceChange.setIs_pay(0);
tFranchiseeBalanceChange.setFranchiseeName(byId.getName());
tFranchiseeBalanceChange.setFranchiseeId(String.valueOf(byId.getId()));
@@ -1068,14 +1068,20 @@
@ApiOperation(value = "设置加盟商操作密码【202506】", tags = {"后台-加盟商管理"})
@PutMapping(value = "/setPayPassword")
public R<String> setPayPassword(@RequestParam(value = "payPassword") String payPassword) {
- Long userid = tokenService.getLoginUser().getUserid();
- SysUser sysUser = sysUserService.getById(userid);
- if(Objects.isNull(sysUser.getFranchiseeId())){
- return R.fail("加盟商信息不存在！");
+ List<Franchisee> franchisee = franchiseeService.list();
+ for (Franchisee franchisee1 : franchisee) {
+ franchisee1.setPayPassword(payPassword);
}
- Franchisee franchisee = franchiseeService.getById(sysUser.getFranchiseeId());
- franchisee.setPayPassword(SecurityUtils.encryptPassword(payPassword));
- return franchiseeService.updateById(franchisee) ? R.ok() : R.fail();
+ return franchiseeService.updateBatchById(franchisee) ? R.ok() : R.fail();
+ }
+ @ApiOperation(value = "获取加盟商操作密码", tags = {"后台-加盟商管理"})
+ @PutMapping(value = "/getPayPassword")
+ public R<String> getPayPassword() {
+ List<Franchisee> franchisee = franchiseeService.list();
+ if (!franchisee.isEmpty()){
+ return R.ok(franchisee.get(0).getPayPassword());
+ }
+ return R.ok();
}
/**
@@ -1086,22 +1092,17 @@
@PutMapping(value = "/balanceWithdraw")
public R<String> balanceWithdraw(@RequestParam(value = "id") Integer id,
@RequestParam(value = "payPassword") String payPassword) {
-
TFranchiseeBalanceChange balanceChange = balanceChangeService.getById(id);
-
Franchisee franchisee = franchiseeService.getById(balanceChange.getFranchiseeId());
-
- if(!SecurityUtils.matchesPassword(payPassword, franchisee.getPayPassword())){
+ if(!payPassword.equals(franchisee.getPayPassword())){
return R.fail("密码错误！");
}
-
franchisee.setBalance(franchisee.getBalance().add(balanceChange.getAmount()));
franchiseeService.updateById(franchisee);
-
// 删除操作记录
balanceChangeService.removeById(id);
-
return R.ok();
}
+
}
--
Gitblit v1.7.1