From d0c0c232e4f1c5551619cae25a8c3a75fd232f4b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 03 九月 2025 11:54:35 +0800
Subject: [PATCH] 加盟商设置是否隐藏
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 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..3ccb91e 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
@@ -13,6 +13,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.admin.api.entity.FranchiseeVO;
import com.ruoyi.admin.config.WeChatConfig;
import com.ruoyi.admin.entity.*;
import com.ruoyi.admin.service.*;
@@ -49,9 +50,11 @@
import lombok.Getter;
import org.apache.commons.codec.CharEncoding;
import org.apache.poi.util.IOUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -408,7 +411,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 +454,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 +513,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 +595,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()));
@@ -877,6 +880,13 @@
MasterWorker byId = masterWorkerService.getById(id);
return R.ok(byId.getProfilePicture());
}
+ @GetMapping(value = "/getFranchiseeInfo")
+ public R<FranchiseeVO> getFranchiseeInfo(@RequestParam("franchiseeId") Integer franchiseeId) {
+ Franchisee franchisee = franchiseeService.getById(franchiseeId);
+ FranchiseeVO franchiseeVO = new FranchiseeVO();
+ BeanUtils.copyProperties(franchisee, franchiseeVO);
+ return R.ok(franchiseeVO);
+ }
/**
* 新增加盟商信息
@@ -907,6 +917,11 @@
.eq(SysUser::getIsEnable, 1).eq(SysUser::getIsDelete, 0).list();
if(!list1.isEmpty()){
return R.passwordError("该管理员账号已存在！");
+ }
+ // 设置加盟商初始密码
+ List<Franchisee> franchiseeList = franchiseeService.list();
+ if (!CollectionUtils.isEmpty(franchiseeList)){
+ franchisee.setPayPassword(franchiseeList.get(0).getPayPassword());
}
boolean save = franchiseeService.save(franchisee);
// 生成sysUser账号
@@ -1068,14 +1083,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,21 +1107,29 @@
@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();
+ }
+ /**
+ * 设置加盟商是否显示司机信息
+ *
+ */
+ @ApiOperation(value = "加盟商设置是否显示【202509】",notes = "id:加盟商id,isDisplay:是否显示 1=是 0=否", tags = {"后台-加盟商管理"})
+ @PutMapping(value = "/setIsDisplay")
+ public R<String> setIsDisplay(@RequestParam(value = "id") Integer id,
+ @RequestParam(value = "isDisplay") Integer isDisplay) {
+ Franchisee franchisee = franchiseeService.getById(id);
+ franchisee.setIsDisplay(isDisplay);
+ franchiseeService.updateById(franchisee);
return R.ok();
}
--
Gitblit v1.7.1