From 7cab5bda99ca42188bc15b2dae7d1fa4d1833fd9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 22 五月 2025 09:50:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 21 ++++++++-------------
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java | 3 +++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java | 4 +++-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 1 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/request/OrderSubmitRequest.java | 3 ++-
ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Order.java | 4 +++-
6 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Order.java b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Order.java
index dd1c513..adf824a 100644
--- a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Order.java
+++ b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Order.java
@@ -27,7 +27,9 @@
@TableId("id")
private Integer id;
-
+ @ApiModelProperty("师傅填写备注")
+ @TableField("remark")
+ private String remark;
@ApiModelProperty("下单城市")
@TableField("city")
private String city;
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
index 138be89..314e5c4 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
@@ -34,6 +34,9 @@
@ApiModelProperty("下单城市")
@TableField("city")
private String city;
+ @ApiModelProperty("师傅填写备注")
+ @TableField("remark")
+ private String remark;
@TableField("province_code")
private String provinceCode;
@TableField("are_code")
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 da824d4..9af3120 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
@@ -619,24 +619,19 @@
@ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
@ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
})
- public R<Page<OrderCountVO>> orderCount(String name, String phone,
- @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+ public R<Page<OrderCountVO>> orderCount(@RequestBody OrderCountDataRequest orderCountDataRequest) {
LoginUser loginUser = tokenService.getLoginUser();
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
- List<String> cityList = new ArrayList<>();
- if (loginUser.getIsFranchisee()) {
- cityList = loginUser.getCityList();
+ if (orderCountDataRequest.getCityList().isEmpty()) {
+ List<String> cityList = new ArrayList<>();
+ if (loginUser.getIsFranchisee()) {
+ cityList = loginUser.getCityList();
+ orderCountDataRequest.setCityList(cityList);
+ }
}
- // 查询参数
- OrderCountDataRequest orderCountDataRequest = new OrderCountDataRequest();
- orderCountDataRequest.setWorkerName(name);
- orderCountDataRequest.setWorkerPhone(phone);
- orderCountDataRequest.setCityList(cityList);
- orderCountDataRequest.setPageNum(pageNum);
- orderCountDataRequest.setPageSize(pageSize);
+
Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
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 b3acb0e..32f12f1 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
@@ -755,6 +755,7 @@
order.setCompleteTime(new Date());
order.setState(Constants.THREE);
order.setFake(orderSubmitRequest.getFake());
+ order.setRemark(orderSubmitRequest.getRemark());
boolean update = orderService.updateById(order);
// 服务记录
ServeRecord serveRecord = new ServeRecord();
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
index 9a59b64..c1821f5 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
@@ -34,7 +34,9 @@
@ApiModelProperty("下单城市")
@TableField("city")
private String city;
-
+ @ApiModelProperty("师傅填写备注")
+ @TableField("remark")
+ private String remark;
@TableField("province_code")
private String provinceCode;
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/request/OrderSubmitRequest.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/request/OrderSubmitRequest.java
index 4789aa9..a922a20 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/request/OrderSubmitRequest.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/request/OrderSubmitRequest.java
@@ -16,7 +16,8 @@
@ApiModelProperty("订单id")
private String orderId;
-
+ @ApiModelProperty("师傅填写备注")
+ private String remark;
@ApiModelProperty("现场照片")
private List<String> photo;
@ApiModelProperty("是否虚假订单")
--
Gitblit v1.7.1