From f8cc44e926fd22f9d1d864dc684c827f6960270b Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 26 七月 2024 11:51:30 +0800
Subject: [PATCH] feat: 最新代码及配置
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
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 2181b11..1f7169b 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
@@ -14,7 +14,10 @@
import com.ruoyi.admin.vo.OrderDetailVO;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.utils.GaoDeMapUtil;
import com.ruoyi.common.core.utils.SnowflakeIdWorker;
+import com.ruoyi.common.core.vo.CityInfoVO;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
@@ -117,7 +120,11 @@
return R.loginExpire("登录失效！");
}
if (loginUser.getIsFranchisee()) {
- orderQueryRequest.setCityList(loginUser.getCityList());
+ if (null == orderQueryRequest.getCityList() || orderQueryRequest.getCityList().isEmpty()) {
+ orderQueryRequest.setCityList(loginUser.getCityList());
+ } else {
+ orderQueryRequest.getCityList().addAll(loginUser.getCityList());
+ }
}
Page<Order> data = orderClient.queryPage(orderQueryRequest).getData();
if (null != data) {
@@ -131,6 +138,7 @@
record.setServerName(masterWorker.getRealName());
record.setServerPhone(masterWorker.getPhone());
}
+ record.setReservationAddress(record.getReservationAddress() + record.getAddress());
}
}
return R.ok(data);
@@ -143,6 +151,17 @@
@ApiOperation(value = "订单列表-各订单数量统计", tags = {"后台-订单管理"})
@PostMapping(value = "/orderPageCount")
public R<OrderPageCountVO> orderPageCount(@RequestBody OrderQueryRequest orderQueryRequest) {
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (null == loginUser) {
+ return R.loginExpire("登录失效！");
+ }
+ if (loginUser.getIsFranchisee()) {
+ if (null == orderQueryRequest.getCityList() || orderQueryRequest.getCityList().isEmpty()) {
+ orderQueryRequest.setCityList(loginUser.getCityList());
+ } else {
+ orderQueryRequest.getCityList().addAll(loginUser.getCityList());
+ }
+ }
return R.ok(orderClient.orderPageCount(orderQueryRequest).getData());
}
--
Gitblit v1.7.1