From 49c7432786a400eec8cc00c34744e76da6ce4dd9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 08 一月 2025 14:33:13 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 36aff59..a468954 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
@@ -167,13 +167,14 @@
return R.ok(balance3);
}
-
@ApiOperation(value = "详情",tags = {"师傅段2.0-统一充值扣款列表"})
@PostMapping(value = "/change/detail")
public R<TFranchiseeBalanceChange> detail1(@RequestParam Integer id) throws AlipayApiException {
- TFranchiseeBalanceChange byId = balanceChangeService.getById(id);
- return R.ok(byId);
-
+ TFranchiseeBalanceChange balanceChange = balanceChangeService.getById(id);
+ if (balanceChange.getType()==2){
+ balanceChange.setPayStr("微信支付");
+ }
+ return R.ok(balanceChange);
}
@@ -184,7 +185,7 @@
SysUser sysUser = sysUserService.getById(userid);
Page<TFranchiseeBalanceChange> page = balanceChangeService.lambdaQuery().eq(moneyRecentQuery.getType() != null, TFranchiseeBalanceChange::getType, moneyRecentQuery.getType())
.eq(sysUser.getFranchiseeId() != null, TFranchiseeBalanceChange::getFranchiseeId, sysUser.getFranchiseeId())
- .eq(moneyRecentQuery.getName() != null && !"".equals(moneyRecentQuery.getName()), TFranchiseeBalanceChange::getFranchiseeName, moneyRecentQuery.getName())
+ .like(moneyRecentQuery.getName() != null && !"".equals(moneyRecentQuery.getName()), TFranchiseeBalanceChange::getFranchiseeName, moneyRecentQuery.getName())
.ge(moneyRecentQuery.getDate1() != null, TFranchiseeBalanceChange::getCreateTime, moneyRecentQuery.getDate1())
.le(moneyRecentQuery.getDate2() != null, TFranchiseeBalanceChange::getCreateTime, moneyRecentQuery.getDate2())
.eq(TFranchiseeBalanceChange::getIs_pay,1)
@@ -198,12 +199,17 @@
String siteIds = franchisee.getSiteIds();
List<Site> list1 = siteService.lambdaQuery().in(Site::getId, siteIds.split(",")).list();
record.setList1(list1);
-
}
String cityCode = franchisee.getCityCode();
List<Region> list = regionService.lambdaQuery().in(Region::getCode, cityCode.split(",")).list();
record.setList(list);
record.setFranchiseeName(franchisee.getName());
+ if (record.getType()==1){
+ record.setPayStr("扣除旧机款");
+ }
+ if (record.getType()==2){
+ record.setPayStr("充值");
+ }
}
return R.ok(page);
}
--
Gitblit v1.7.1