From 8d84b4fbcb716146faccc02d32271a481f0ecf5f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 08 一月 2025 16:30:05 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 8 +++++++-
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 10 ++++++++--
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 3 ++-
3 files changed, 17 insertions(+), 4 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 a468954..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());
@@ -188,6 +192,7 @@
.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()));
@@ -225,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();
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
index 805a9d5..2c06973 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -849,9 +849,15 @@
throw new ServiceException("上门时间格式错误");
}
+ if(!StringUtils.hasLength(address)){
+ return R.fail("详细地址不能为空");
+ }
// 解析地址经纬度
- CityInfoVO cityInfoVO = GaoDeMapUtil.getAddressInfo(province + city + area + address).getDatas();
- if(Objects.isNull(cityInfoVO.getLongitude()) || Objects.isNull(cityInfoVO.getLatitude())){
+ CityInfoVO cityInfoVO = GaoDeMapUtil.getAddressInfo((province==null?"":province)
+ + (city==null?"":city)
+ + (area==null?"":area)
+ + address).getDatas();
+ if(cityInfoVO==null||Objects.isNull(cityInfoVO.getLongitude()) || Objects.isNull(cityInfoVO.getLatitude())){
return R.fail("地址输入不正确");
}
String areaCode = cityInfoVO.getCode();
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 4a5ad8c..b080f34 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -592,7 +592,8 @@
@RequestParam("siteIds") List<String> siteIds
) {
Page<Order> page = orderService.lambdaQuery().eq(Order::getUserId, userId)
- .eq(Order::getIsDelete, 0).in(!siteIds.isEmpty(),Order::getSiteId, siteIds).in(!cityList.isEmpty(),Order::getCityCode, cityList).page(Page.of(pageNum, pageSize));
+ .eq(Order::getIsDelete, 0)
+ .in(!cityList.isEmpty(),Order::getCityCode, cityList).page(Page.of(pageNum, pageSize));
return R.ok(page);
}
--
Gitblit v1.7.1