From 79e6a7f880512f4773f03fc015eb10cf9c401f73 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 17 四月 2025 14:13:31 +0800
Subject: [PATCH] 2.0迭代
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java | 9 +++------
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 5 +++--
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/FranchiseeWithdraw.java | 5 ++---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 2 +-
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 3 ++-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageCountVO.java | 5 ++++-
6 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
index 9487cf5..02d2a11 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
@@ -436,5 +436,5 @@
* @return
*/
@GetMapping(value = "/order/batchUpdateTime")
- R<Boolean> batchUpdateTime(@RequestParam("ids")String ids,@RequestParam("arriveTime")String time);
+ R<Boolean> batchUpdateTime(@RequestParam("ids")String ids,@RequestParam("time")String time);
}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/FranchiseeWithdraw.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/FranchiseeWithdraw.java
index aadcdb2..93c2947 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/FranchiseeWithdraw.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/FranchiseeWithdraw.java
@@ -21,15 +21,14 @@
@ApiModelProperty(value = "主键ID")
@TableId(value = "id", type = IdType.AUTO)
-
private Integer id;
@ApiModelProperty(value = "加盟商余额明细记录id")
- @TableField("changeId")
+ @TableField("change_id")
private Integer changeId;
@ApiModelProperty(value = "加盟商id")
- @TableField("franchiseeId")
+ @TableField("franchisee_id")
private Integer franchiseeId;
@ApiModelProperty(value = "状态1待审核 2已通过 3已驳回")
@TableField("status")
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 4be2b7c..9a59b64 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
@@ -197,12 +197,9 @@
@ApiModelProperty("再投数量")
@TableField(exist = false)
private Integer reInvestment=0;
-
-
-
-
-
-
+ @ApiModelProperty("待预约数量")
+ @TableField(exist = false)
+ private Integer pending=0;
@ApiModelProperty("是否为再投单")
@TableField("is_reinvest")
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 6b361cb..514d88e 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -180,9 +180,10 @@
Integer completed = order.getCompleted();
Integer canceled = order.getCanceled();
Integer reInvestment = order.getReInvestment();
- int total = toBeDispatched + stayDoorstep + toBeCompleted + completed + canceled + reInvestment;
+ Integer pending = order.getPending();
+ int total = toBeDispatched + stayDoorstep + toBeCompleted + completed + canceled + reInvestment + pending;
return new OrderPageCountVO(total, toBeDispatched, stayDoorstep,
- toBeCompleted, completed, canceled, reInvestment);
+ toBeCompleted, completed, canceled, reInvestment,pending);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageCountVO.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageCountVO.java
index 33d1a4e..1f9ea00 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageCountVO.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageCountVO.java
@@ -31,9 +31,11 @@
@ApiModelProperty("再投订单")
private Integer reInvestment;
+ @ApiModelProperty("待预约数量")
+ private Integer pending;
public OrderPageCountVO(Integer total, Integer toBeDispatched, Integer stayDoorstep, Integer toBeCompleted,
- Integer completed, Integer canceled, Integer reInvestment) {
+ Integer completed, Integer canceled, Integer reInvestment,Integer pending) {
this.total = total;
this.toBeDispatched = toBeDispatched;
this.stayDoorstep = stayDoorstep;
@@ -41,5 +43,6 @@
this.completed = completed;
this.canceled = canceled;
this.reInvestment = reInvestment;
+ this.pending = pending;
}
}
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index 119546a..b1a8650 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -477,7 +477,8 @@
sum(case when o.state = 2 then 1 end) as toBeCompleted,
sum(case when o.state = 3 then 1 end) as completed,
sum(case when o.state = 4 then 1 end) as canceled,
- sum(case when o.state = 6 then 1 end) as reInvestment
+ sum(case when o.state = 6 then 1 end) as reInvestment,
+ sum(case when o.state = 7 then 1 end) as pending
from t_order o
<where>
o.is_delete = 0
--
Gitblit v1.7.1