From f198eb8efc4cc3c53e6b5839dabb4aae4c68510c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 08 一月 2025 17:16:55 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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..1998405 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
@@ -122,10 +122,13 @@
@ApiImplicitParam(value = "管理员", name = "head", dataType = "String"),
@ApiImplicitParam(value = "手机号码", name = "phone", dataType = "String"),
@ApiImplicitParam(value = "管辖城市", name = "city", dataType = "String"),
+ @ApiImplicitParam(value = "充值/扣款起始时间", name = "date1", dataType = "String"),
+ @ApiImplicitParam(value = "充值/扣款结束时间", name = "date2", dataType = "String"),
@ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
@ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
})
public R<RencentBalance> recentmoney(String name, String head, String phone, String city,
+ String date1,String date2,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
BigDecimal balance = new BigDecimal(0);
@@ -140,11 +143,11 @@
for (Franchisee franchisee : list) {
balance = balance.add(franchisee.getBalance());
}
-
//充值的金额
BigDecimal balance1 = new BigDecimal(0);
List<TFranchiseeBalanceChange> list1 = balanceChangeService.lambdaQuery()
.in(TFranchiseeBalanceChange::getFranchiseeId,collect)
+ .between(date1!=null,TFranchiseeBalanceChange::getCreateTime, date1, date2)
.eq(TFranchiseeBalanceChange::getType, 1).list();
for (TFranchiseeBalanceChange franchiseeBalanceChange : list1) {
balance1 = balance1.add(franchiseeBalanceChange.getAmount());
@@ -154,6 +157,7 @@
List<TFranchiseeBalanceChange> list2 = balanceChangeService.lambdaQuery()
.in(TFranchiseeBalanceChange::getFranchiseeId,collect)
.eq(TFranchiseeBalanceChange::getType, 2)
+ .between(date1!=null,TFranchiseeBalanceChange::getCreateTime, date1, date2)
.eq(TFranchiseeBalanceChange::getIs_pay,1).list();
for (TFranchiseeBalanceChange franchiseeBalanceChange : list2) {
balance2 = balance2.add(franchiseeBalanceChange.getAmount());
@@ -167,13 +171,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,9 +189,10 @@
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(moneyRecentQuery.getFranchId()!=null, TFranchiseeBalanceChange::getFranchiseeId, moneyRecentQuery.getFranchId())
.eq(TFranchiseeBalanceChange::getIs_pay,1)
.orderByDesc(TFranchiseeBalanceChange::getCreateTime)
.page(Page.of(moneyRecentQuery.getPageNum(), moneyRecentQuery.getPageSize()));
@@ -198,12 +204,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);
}
@@ -219,6 +230,7 @@
.eq(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(moneyRecentQuery.getFranchId()!=null, TFranchiseeBalanceChange::getFranchiseeId, moneyRecentQuery.getFranchId())
.eq(TFranchiseeBalanceChange::getIs_pay,1)
.orderByDesc(TFranchiseeBalanceChange::getCreateTime)
.list();
--
Gitblit v1.7.1