From b5ead35c1d955f2a0e2e10da79254860d0ba95e9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 23 五月 2025 14:50:27 +0800
Subject: [PATCH] 大屏接口bug修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 38 +++++++-----------
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/FranchiseeListDTO.java | 17 ++++++++
ruoyi-service/ruoyi-admin/src/main/resources/template/订单记录.xlsx | 0
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 8 ---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java | 1
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java | 1
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderSubmitRequest.java | 2 +
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderInfoVO.java | 2 +
8 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderSubmitRequest.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderSubmitRequest.java
index 2e6f210..d532304 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderSubmitRequest.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderSubmitRequest.java
@@ -16,6 +16,8 @@
@ApiModelProperty("订单id")
private String orderId;
+ @ApiModelProperty("备注")
+ private String remark;
@ApiModelProperty("现场照片")
private List<String> photo;
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 96a11c1..69932a4 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
@@ -22,10 +22,7 @@
import com.ruoyi.admin.utils.util.HttpRequester;
import com.ruoyi.admin.utils.util.HttpRespons;
import com.ruoyi.admin.utils.util.Md5_Sign;
-import com.ruoyi.admin.vo.InfoDto;
-import com.ruoyi.admin.vo.MoneyRecentQuery;
-import com.ruoyi.admin.vo.PayDto;
-import com.ruoyi.admin.vo.RencentBalance;
+import com.ruoyi.admin.vo.*;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
@@ -730,30 +727,25 @@
/**
* 加盟商信息分页列表
*
- * @param pageNum 页码
- * @param pageSize 每页显示条数
*/
@RequiresPermissions("franchisee_list")
@ApiOperation(value = "加盟商信息分页查询列表", tags = {"后台-加盟商管理"})
- @GetMapping(value = "/page")
- @ApiImplicitParams({
- @ApiImplicitParam(value = "加盟商名称", name = "name", dataType = "String"),
- @ApiImplicitParam(value = "管理员", name = "head", dataType = "String"),
- @ApiImplicitParam(value = "手机号码", name = "phone", dataType = "String"),
- @ApiImplicitParam(value = "管辖城市", name = "city", dataType = "String"),
- @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
- @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
- })
- public R<IPage<Franchisee>> queryPageList(String name, String head, String phone, String city,
- @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+ @PostMapping(value = "/page")
+ public R<IPage<Franchisee>> queryPageList(@RequestBody FranchiseeListDTO dto) {
LambdaQueryChainWrapper<Franchisee> wrapper = franchiseeService.lambdaQuery();
- wrapper = StringUtils.isNotBlank(name) ? wrapper.like(Franchisee::getName, name) : wrapper;
- wrapper = StringUtils.isNotBlank(head) ? wrapper.like(Franchisee::getHead, head) : wrapper;
- wrapper = StringUtils.isNotBlank(phone) ? wrapper.like(Franchisee::getHeadPhone, phone) : wrapper;
- wrapper = StringUtils.isNotBlank(city) ? wrapper.like(Franchisee::getCity, city) : wrapper;
+ wrapper = StringUtils.isNotBlank(dto.getName()) ? wrapper.like(Franchisee::getName, dto.getName()) : wrapper;
+ wrapper = StringUtils.isNotBlank(dto.getHead()) ? wrapper.like(Franchisee::getHead, dto.getHead()) : wrapper;
+ wrapper = StringUtils.isNotBlank(dto.getPhone()) ? wrapper.like(Franchisee::getHeadPhone, dto.getPhone()) : wrapper;
+ if (org.springframework.util.StringUtils.hasLength(dto.getCity())){
+ String[] cityCodes = dto.getCity().split(",");
+ wrapper.and(wrapperLike -> {
+ Arrays.stream(cityCodes)
+ .forEach(code -> wrapperLike.like(Franchisee::getCityCode, code));
+ });
+ }
+
Page<Franchisee> page = wrapper.eq(Franchisee::getIsDelete, 0)
- .orderByDesc(Franchisee::getCreateTime).page(Page.of(pageNum, pageSize));
+ .orderByDesc(Franchisee::getCreateTime).page(Page.of(dto.getPageNum(), dto.getPageSize()));
for (Franchisee record : page.getRecords()) {
if (record.getSiteIds()!=null){
String[] split = record.getSiteIds().split(",");
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 9af3120..758f639 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
@@ -612,13 +612,7 @@
*/
@RequiresPermissions("order_count")
@ApiOperation(value = "订单统计", tags = {"后台-订单管理"})
- @GetMapping(value = "/orderCount")
- @ApiImplicitParams({
- @ApiImplicitParam(value = "师傅姓名", name = "name", dataType = "String"),
- @ApiImplicitParam(value = "师傅电话", name = "phone", dataType = "String"),
- @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
- @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
- })
+ @PostMapping(value = "/orderCount")
public R<Page<OrderCountVO>> orderCount(@RequestBody OrderCountDataRequest orderCountDataRequest) {
LoginUser loginUser = tokenService.getLoginUser();
if (null == loginUser) {
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
index 3259f5c..d939634 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
@@ -217,6 +217,7 @@
orderInfo.setOrderNumber(order.getOrderNumber());
orderInfo.setPlaceOrderTime(order.getCreateTime());
orderInfo.setState(order.getState());
+ orderInfo.setRemark(order.getRemark());
orderInfo.setCompleteTime(order.getCompleteTime());
orderInfo.setReservationRemark(order.getReservationRemark());
}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/FranchiseeListDTO.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/FranchiseeListDTO.java
new file mode 100644
index 0000000..0a537da
--- /dev/null
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/FranchiseeListDTO.java
@@ -0,0 +1,17 @@
+package com.ruoyi.admin.vo;
+
+import com.ruoyi.admin.entity.Franchisee;
+import com.ruoyi.admin.entity.Region;
+import com.ruoyi.admin.entity.Site;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FranchiseeListDTO extends PageDto{
+ private String name ;
+ private String head ;
+ private String phone ;
+ private String city ;
+}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderInfoVO.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderInfoVO.java
index 794f297..4dd0936 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderInfoVO.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderInfoVO.java
@@ -29,5 +29,7 @@
private Integer state;
@ApiModelProperty("预约备注")
private String reservationRemark;
+ @ApiModelProperty("备注")
+ private String remark;
}
diff --git "a/ruoyi-service/ruoyi-admin/src/main/resources/template/\350\256\242\345\215\225\350\256\260\345\275\225.xlsx" "b/ruoyi-service/ruoyi-admin/src/main/resources/template/\350\256\242\345\215\225\350\256\260\345\275\225.xlsx"
index ee3e0ee..65a3e81 100644
--- "a/ruoyi-service/ruoyi-admin/src/main/resources/template/\350\256\242\345\215\225\350\256\260\345\275\225.xlsx"
+++ "b/ruoyi-service/ruoyi-admin/src/main/resources/template/\350\256\242\345\215\225\350\256\260\345\275\225.xlsx"
Binary files differ
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
index a9dd377..b39984f 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
@@ -23,6 +23,7 @@
@ApiModelProperty("评价信息")
private Evaluate evaluateInfo;
+
public OrderDetailVO() {
}
--
Gitblit v1.7.1