From 597e90b77d49872baf19e03524be9b43444fa64f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 30 八月 2024 10:22:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java | 2 +-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderAppealService.java | 2 +-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java | 2 +-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
index 2bbba87..e64f518 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
@@ -83,7 +83,7 @@
*/
@GetMapping(value = "/getDetailById")
@ApiOperation(tags = {"小程序-订单申诉"},value = "查询订单申诉详情")
- public AjaxResult<TOrderAppealVO> getDetailById(Integer id) {
+ public AjaxResult<TOrderAppealVO> getDetailById(String id) {
return AjaxResult.ok(orderAppealService.getDetailById(id));
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderAppealService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderAppealService.java
index 1cad0a1..2ed3cae 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderAppealService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderAppealService.java
@@ -28,5 +28,5 @@
* @param id
* @return
*/
- TOrderAppealVO getDetailById(Integer id);
+ TOrderAppealVO getDetailById(String id);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
index 80c16b5..6c8d89c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
@@ -76,7 +76,7 @@
}
@Override
- public TOrderAppealVO getDetailById(Integer id) {
+ public TOrderAppealVO getDetailById(String id) {
TOrderAppeal orderAppeal = this.baseMapper.selectById(id);
TOrderAppealVO orderAppealVO = new TOrderAppealVO();
BeanUtils.copyProperties(orderAppeal,orderAppealVO);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
index ac22a39..61431f4 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
@@ -90,7 +90,7 @@
public AjaxResult addOrderInvoice(AddOrderInvoice addOrderInvoice) {
Long userId = tokenService.getLoginUserApplet().getUserId();
String orders = addOrderInvoice.getOrders();
- if(StringUtils.isNotEmpty(orders)){
+ if(StringUtils.isEmpty(orders)){
return AjaxResult.error("请选择有效的订单");
}
JSONArray parse = JSONArray.parse(orders);
--
Gitblit v1.7.1