From f20015f5b2a2ac70dcb640d524196efe2c6786d3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 01 九月 2025 17:14:40 +0800
Subject: [PATCH] 复用问题,以及订单列表页面相关信息新增
---
seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java | 3 ++-
buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java | 10 ++--------
framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java | 6 ++++++
framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java | 2 +-
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 22 +++++++++++++++++-----
framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java | 5 ++++-
manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java | 3 ++-
7 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
index d241c01..61888b1 100644
--- a/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
@@ -70,14 +70,8 @@
public ResultMessage<IPage<OrderSimpleVO>> queryMineOrder(OrderSearchParams orderSearchParams) {
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
orderSearchParams.setMemberId(currentUser.getId());
- IPage<OrderSimpleVO> t = orderService.queryByParams(orderSearchParams);
-
- if (!adminUserService.havePermissionRole(AdminRoleEnum.ORDER_INFO_PERMISSION)){
- for (OrderSimpleVO vo : t.getRecords()){
- vo.setConsigneeName(CommonUtil.maskName(vo.getConsigneeName()));
- vo.setConsigneeMobile(CommonUtil.maskMobile(vo.getConsigneeMobile()));
- }
- }
+ Boolean needHide = false;
+ IPage<OrderSimpleVO> t = orderService.queryByParams(orderSearchParams,needHide);
t.getRecords().forEach(orderSimpleVO -> {
String groupImages = orderSimpleVO.getGroupImages();
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
index 8611e2f..089802f 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
@@ -156,9 +156,15 @@
/**
* 鏁忔劅淇℃伅
*/
+
private String consigneeName;
private String consigneeMobile;
+
+ private String memberId;
+ @Setter
+ private String nickName;
+
public List<OrderItemVO> getOrderItems() {
if (CharSequenceUtil.isEmpty(groupGoodsId)) {
return new ArrayList<>();
diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
index a451684..15827e4 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
@@ -85,6 +85,7 @@
"store_name,o.store_id as store_id,o.client_type,o.order_type,o.deliver_status,o.order_promotion_type,o.seller_remark, " +
"o.consignee_name AS consigneeName," +
"o.consignee_mobile AS consigneeMobile," +
+ "o.member_id AS memberId," +
" GROUP_CONCAT(oi.goods_id) as group_goods_id," +
" GROUP_CONCAT(oi.sku_id) as group_sku_id," +
" GROUP_CONCAT(oi.num) as group_num" +
@@ -97,7 +98,9 @@
",GROUP_CONCAT(oi.goods_price) as group_goods_price " +
",GROUP_CONCAT(oi.is_refund) as group_is_refund " +
",GROUP_CONCAT(oi.refund_price) as group_refund_price " +
- " FROM li_order o LEFT JOIN li_order_item AS oi on o.sn = oi.order_sn ${ew.customSqlSegment} ")
+ " FROM li_order o LEFT JOIN li_order_item AS oi on o.sn = oi.order_sn " +
+ "${ew.customSqlSegment}")
+
IPage<OrderSimpleVO> queryByParams(IPage<OrderSimpleVO> page, @Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);
/**
* 鏌ヨ璁㈠崟绠�鐭俊鎭垎椤�
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
index 616e2c3..bb6a433 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
@@ -52,7 +52,7 @@
* @param orderSearchParams 鏌ヨ鍙傛暟
* @return 绠�鐭鍗曞垎椤�
*/
- IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams);
+ IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams,Boolean needHide);
/**
* 璁㈠崟鏌ヨ
*
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index 2b65ab7..f73c50e 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -28,7 +28,9 @@
import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;
import cn.lili.modules.goods.service.GoodsService;
import cn.lili.modules.lmk.enums.general.AdminRoleEnum;
+import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
+import cn.lili.modules.member.mapper.MemberMapper;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
import cn.lili.modules.order.order.aop.OrderLogPoint;
@@ -108,6 +110,8 @@
private static final String ORDER_SN_COLUMN = "order_sn";
+ @Autowired
+ private MemberMapper memberMapperMapper;
/**
* 寤舵椂浠诲姟
*/
@@ -240,16 +244,24 @@
}
@Override
- public IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams) {
+ public IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams,Boolean needHide) {
QueryWrapper queryWrapper = orderSearchParams.queryWrapper();
queryWrapper.groupBy("o.id");
queryWrapper.orderByDesc("o.id");
IPage<OrderSimpleVO> page = this.baseMapper.queryByParams(PageUtil.initPage(orderSearchParams), queryWrapper);
+ if (needHide){
+ if (!adminUserService.havePermissionRole(AdminRoleEnum.ORDER_INFO_PERMISSION)){
+ for (OrderSimpleVO vo : page.getRecords()){
+ vo.setConsigneeName(CommonUtil.maskName(vo.getConsigneeName()));
+ vo.setConsigneeMobile(CommonUtil.maskMobile(vo.getConsigneeMobile()));
+ }
+ }
+ }
- if (!adminUserService.havePermissionRole(AdminRoleEnum.ORDER_INFO_PERMISSION)){
- for (OrderSimpleVO vo : page.getRecords()){
- vo.setConsigneeName(CommonUtil.maskName(vo.getConsigneeName()));
- vo.setConsigneeMobile(CommonUtil.maskMobile(vo.getConsigneeMobile()));
+ for (OrderSimpleVO vo : page.getRecords()){
+ Member member = memberMapperMapper.selectById(vo.getMemberId());
+ if (member != null){
+ vo.setNickName(member.getNickName());
}
}
return page;
diff --git a/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
index 34c3d4d..f915edd 100644
--- a/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
@@ -61,7 +61,8 @@
@ApiOperation(value = "鏌ヨ璁㈠崟鍒楄〃鍒嗛〉")
@GetMapping
public ResultMessage<IPage<OrderSimpleVO>> queryMineOrder(OrderSearchParams orderSearchParams) {
- return ResultUtil.data(orderService.queryByParams(orderSearchParams));
+ Boolean needHide = true;
+ return ResultUtil.data(orderService.queryByParams(orderSearchParams,needHide));
}
@ApiOperation(value = "鏇存柊璁㈠崟鐘舵��")
@GetMapping("/sendMessage/{snNo}")
diff --git a/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
index f80547c..0e51bde 100644
--- a/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
@@ -81,7 +81,8 @@
@ApiOperation(value = "鏌ヨ璁㈠崟鍒楄〃")
@GetMapping
public ResultMessage<IPage<OrderSimpleVO>> queryMineOrder(OrderSearchParams orderSearchParams) {
- return ResultUtil.data(orderService.queryByParams(orderSearchParams));
+ Boolean needHide = true;
+ return ResultUtil.data(orderService.queryByParams(orderSearchParams,needHide));
}
--
Gitblit v1.8.0