From ab7045d70310f4c5b150090b7c9fa18dea7ea1e7 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 五月 2024 15:50:57 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 5 +++--
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
index b5320aa..5e1d85a 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
@@ -224,10 +224,11 @@
@GetMapping("/updateOrderAddress")
@ApiOperation(value = "修改订单收货地址", tags = {"修改订单收货地址"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true),
+ @ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
@ApiImplicitParam(value = "完整收货地址", name = "address", dataType = "String", required = true)
})
- public AjaxResult<Boolean> updateOrderAddress(@RequestParam String orderId, @RequestParam String address) {
+ public AjaxResult<Boolean> updateOrderAddress(@RequestParam String orderId,
+ @RequestParam String address) {
return AjaxResult.success(orderService.lambdaUpdate().set(TOrder::getConsigneeAddress, address)
.eq(TOrder::getId, orderId).eq(TOrder::getState, 1).update());
}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
index f40fda8..76216a8 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
@@ -120,7 +120,7 @@
List<String> strings = new ArrayList<>();
strings.add("insertTime");
wrapper.orderByDesc(strings);
- wrapper.ne("isDelete",1);
+
List<TUseGuide> useGuides = useGuideService.list(wrapper);
PageInfo<TUseGuide> res = new PageInfo<>(pageNumber, pageSize);
res.setRecords(useGuides);
--
Gitblit v1.7.1