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(); 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<>(); 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); /** * 查询订单简短信息分页 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); /** * 订单查询 * 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; 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}") 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)); }
