From 5733a56e68d78897eb58536565d98f153eb25d0b Mon Sep 17 00:00:00 2001 From: jwf1173 <1553713823@qq.com> Date: Thu, 14 May 2020 08:55:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AFreview?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rderDeliverRequest.java => AdminsOrderDeliverRequest.java} | 2 +- ...emUpdateRequest.java => AdminsOrderItemUpdateRequest.java} | 2 +- ...LogisticsRequest.java => AdminsOrderLogisticsRequest.java} | 2 +- ...PageQueryRequest.java => AdminsOrderPageQueryRequest.java} | 2 +- .../{OrderPageRequest.java => AdminsOrderPageRequest.java} | 4 ++-- ...rnQueryRequest.java => AdminsOrderReturnQueryRequest.java} | 2 +- .../java/cn/iocoder/mall/system/biz/dao/user/UserMapper.java | 1 + 7 files changed, 8 insertions(+), 7 deletions(-) rename order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/{OrderDeliverRequest.java => AdminsOrderDeliverRequest.java} (94%) rename order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/{OrderItemUpdateRequest.java => AdminsOrderItemUpdateRequest.java} (94%) rename order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/{OrderLogisticsRequest.java => AdminsOrderLogisticsRequest.java} (95%) rename order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/{OrderPageQueryRequest.java => AdminsOrderPageQueryRequest.java} (96%) rename order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/{OrderPageRequest.java => AdminsOrderPageRequest.java} (89%) rename order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/{OrderReturnQueryRequest.java => AdminsOrderReturnQueryRequest.java} (94%) diff --git a/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderDeliverRequest.java b/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderDeliverRequest.java similarity index 94% rename from order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderDeliverRequest.java rename to order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderDeliverRequest.java index 2a7326da8..82df15a38 100644 --- a/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderDeliverRequest.java +++ b/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderDeliverRequest.java @@ -17,7 +17,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @ApiModel(description = "订单发货PO") -public class OrderDeliverRequest implements Serializable { +public class AdminsOrderDeliverRequest implements Serializable { /** * 订单编号 diff --git a/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderItemUpdateRequest.java b/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderItemUpdateRequest.java similarity index 94% rename from order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderItemUpdateRequest.java rename to order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderItemUpdateRequest.java index 263bc3bec..64c46a28b 100644 --- a/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderItemUpdateRequest.java +++ b/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderItemUpdateRequest.java @@ -17,7 +17,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @ApiModel("订单item更新") -public class OrderItemUpdateRequest implements Serializable { +public class AdminsOrderItemUpdateRequest implements Serializable { /** * 编号 diff --git a/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderLogisticsRequest.java b/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderLogisticsRequest.java similarity index 95% rename from order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderLogisticsRequest.java rename to order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderLogisticsRequest.java index 80df6f660..dd59bf25e 100644 --- a/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderLogisticsRequest.java +++ b/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderLogisticsRequest.java @@ -17,7 +17,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @ApiModel("订单物流信息") -public class OrderLogisticsRequest implements Serializable { +public class AdminsOrderLogisticsRequest implements Serializable { /** * 订单 id diff --git a/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderPageQueryRequest.java b/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderPageQueryRequest.java similarity index 96% rename from order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderPageQueryRequest.java rename to order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderPageQueryRequest.java index d56338c4e..3030eada2 100644 --- a/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderPageQueryRequest.java +++ b/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderPageQueryRequest.java @@ -17,7 +17,7 @@ import org.springframework.format.annotation.DateTimeFormat; @Data @Accessors(chain = true) @ApiModel("订单查询") -public class OrderPageQueryRequest implements Serializable { +public class AdminsOrderPageQueryRequest implements Serializable { /** * id diff --git a/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderPageRequest.java b/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderPageRequest.java similarity index 89% rename from order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderPageRequest.java rename to order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderPageRequest.java index 412e446a5..5b769db86 100644 --- a/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderPageRequest.java +++ b/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderPageRequest.java @@ -18,8 +18,8 @@ import java.util.List; @Data @Accessors(chain = true) @ApiModel("订单VO") -// TODO FROM 芋艿 to jwf1173：命名要改下，rest 以 Admins 和 Users 开头 -public class OrderPageRequest implements Serializable { +// TODO FROM 芋艿 to jwf1173：命名要改下，rest 以 Admins 和 Users 开头 [DONE] +public class AdminsOrderPageRequest implements Serializable { /** * 分页 diff --git a/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderReturnQueryRequest.java b/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderReturnQueryRequest.java similarity index 94% rename from order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderReturnQueryRequest.java rename to order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderReturnQueryRequest.java index d4c89d137..ccd2b9b9e 100644 --- a/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderReturnQueryRequest.java +++ b/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderReturnQueryRequest.java @@ -15,7 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat; */ @Data @Accessors(chain = true) -public class OrderReturnQueryRequest implements Serializable { +public class AdminsOrderReturnQueryRequest implements Serializable { /** * diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/user/UserMapper.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/user/UserMapper.java index 1968f0e7a..3cac873f8 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/user/UserMapper.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/user/UserMapper.java @@ -26,6 +26,7 @@ public interface UserMapper extends BaseMapper { */ default IPage selectUserPage(UserPageDTO userPageDTO) { // TODO FROM 芋艿 to jwf1173：看下 QueryWrapperX 噢，已经提供判空啦 + // TODO FROM 伟帆 to 芋艿： 这里是使用MP原生的判空，支持lambda好，还是使用QueryWrapperX，使用字段名字符串的好呢 return this.selectPage(new Page<>(userPageDTO.getPageNo(), userPageDTO.getPageSize()), Wrappers.query().lambda() .eq(StringUtils.isNotBlank(userPageDTO.getNickname()), UserDO::getNickname, userPageDTO.getNickname())